public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give controller for pad.html a more appropriate name.

pull/371/head
Chad Weider 2012-01-26 20:37:18 -08:00
parent 514698162f
commit 3e9b56aa75
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/utils/tar.json
View File

@ -1,6 +1,7 @@
{ {
"pad.js": [ "pad.js": [
"jquery.js" "jquery.js"
, "pad.js"
, "ace2_common.js" , "ace2_common.js"
, "pad_utils.js" , "pad_utils.js"
, "plugins.js" , "plugins.js"
@ -17,7 +18,6 @@
, "pad_impexp.js" , "pad_impexp.js"
, "pad_savedrevs.js" , "pad_savedrevs.js"
, "pad_connectionstatus.js" , "pad_connectionstatus.js"
, "pad2.js"
, "jquery-ui.js" , "jquery-ui.js"
, "chat.js" , "chat.js"
, "excanvas.js" , "excanvas.js"

0
static/js/pad2.js → static/js/pad.js
View File

4
static/js/pad_utils.js
View File

@ -34,7 +34,7 @@ var padutils = {
}, },
uniqueId: function() uniqueId: function()
{ {
var pad = require('/pad2').pad; // Sidestep circular dependency var pad = require('/pad').pad; // Sidestep circular dependency
function encodeNum(n, width) function encodeNum(n, width)
{ {
// returns string that is exactly 'width' chars, padding with zeros // returns string that is exactly 'width' chars, padding with zeros
@ -209,7 +209,7 @@ var padutils = {
}, },
timediff: function(d) timediff: function(d)
{ {
var pad = require('/pad2').pad; // Sidestep circular dependency var pad = require('/pad').pad; // Sidestep circular dependency
function format(n, word) function format(n, word)
{ {
n = Math.round(n); n = Math.round(n);

2
static/pad.html
View File

@ -298,7 +298,7 @@
<script> <script>
/* TODO: These globals shouldn't exist. */ /* TODO: These globals shouldn't exist. */
pad = require('/pad2').pad; pad = require('/pad').pad;
chat = require('/chat').chat; chat = require('/chat').chat;
padeditbar = require('/pad_editbar').padeditbar; padeditbar = require('/pad_editbar').padeditbar;
padimpexp = require('/pad_impexp').padimpexp; padimpexp = require('/pad_impexp').padimpexp;