fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #382 from cweider/fixes 

Fixes
This commit is contained in:
John McLear 2012-01-30 15:29:11 -08:00
parent cd36849dc3 23a166ca99
commit 9ed42ac801
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/json2.js
View File

@ -469,3 +469,5 @@ if (!JSON)
}; };
} }
}()); }());
module.exports = JSON;

2
static/js/pad.js
View File

@ -30,7 +30,7 @@ require('/jquery');
require('/jquery-ui'); require('/jquery-ui');
require('/farbtastic'); require('/farbtastic');
require('/excanvas'); require('/excanvas');
require('/json2'); JSON = require('/json2');
require('/undo-xpopup'); require('/undo-xpopup');
var chat = require('/chat').chat; var chat = require('/chat').chat;

1
static/js/pad_editor.js
View File

@ -141,6 +141,7 @@ var padeditor = (function()
if (self.ace) if (self.ace)
{ {
self.ace.destroy(); self.ace.destroy();
self.ace = null;
} }
}, },
disable: function() disable: function()

2
static/js/timeslider.js
View File

@ -23,7 +23,7 @@
// These jQuery things should create local references, but for now `require()` // These jQuery things should create local references, but for now `require()`
// assigns to the global `$` and augments it with plugins. // assigns to the global `$` and augments it with plugins.
require('/jquery'); require('/jquery');
require('/json2'); JSON = require('/json2');
require('/undo-xpopup'); require('/undo-xpopup');
function createCookie(name,value,days) function createCookie(name,value,days)