mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-27 19:06:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bugfixes

Browse source
This commit is contained in:
Egil Moeller 2015-04-25 19:56:22 +02:00
parent 90b359c82b
commit 61e0442ec7
6 changed files with 6128 additions and 6103 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/static/js/ace2_inner.js
View file

@ -20,10 +20,24 @@
* limitations under the License.
*/
define(["ep_etherpad-lite/static/js/rjquery", "underscore", 'ep_etherpad-lite/static/js/pluginfw/hooks'], function ($, _, hooks) {
define(["ep_etherpad-lite/static/js/rjquery", "underscore", 'ep_etherpad-lite/static/js/pluginfw/hooks', 'ep_etherpad-lite/static/js/linestylefilter', 'ep_etherpad-lite/static/js/domline'], function ($, _, hooks, linestylefilterMod, domlineMod) {
var linestylefilter = linestylefilterMod.linestylefilter;
var domline = domlineMod.domline;
var exports = {};
var browser = require('./browser').browser;
var Ace2Common = require('./ace2_common');
var makeChangesetTracker = require('./changesettracker').makeChangesetTracker;
var colorutils = require('./colorutils').colorutils;
var makeContentCollector = require('./contentcollector').makeContentCollector;
var makeCSSManager = require('./cssmanager').makeCSSManager;
var AttribPool = require('./AttributePool');
var Changeset = require('./Changeset');
var ChangesetUtils = require('./ChangesetUtils');
var SkipList = require('./skiplist');
var undoModule = require('./undomodule').undoModule;
var AttributeManager = require('./AttributeManager');
if(browser.msie){
// Honestly fuck IE royally.
// Basically every hack we have since V11 causes a problem
@ -34,8 +48,6 @@ if(browser.msie){
}
}
var Ace2Common = require('./ace2_common');
var isNodeText = Ace2Common.isNodeText,
getAssoc = Ace2Common.getAssoc,
setAssoc = Ace2Common.setAssoc,
@ -45,20 +57,6 @@ var isNodeText = Ace2Common.isNodeText,
noop = Ace2Common.noop;
function Ace2Inner(editorInfo){
var makeChangesetTracker = require('./changesettracker').makeChangesetTracker;
var colorutils = require('./colorutils').colorutils;
var makeContentCollector = require('./contentcollector').makeContentCollector;
var makeCSSManager = require('./cssmanager').makeCSSManager;
var domline = require('./domline').domline;
var AttribPool = require('./AttributePool');
var Changeset = require('./Changeset');
var ChangesetUtils = require('./ChangesetUtils');
var linestylefilter = require('./linestylefilter').linestylefilter;
var SkipList = require('./skiplist');
var undoModule = require('./undomodule').undoModule;
var AttributeManager = require('./AttributeManager');
var DEBUG = false; //$$ build script replaces the string "var DEBUG=true;//$$" with "var DEBUG=false;"
// changed to false
var isSetUp = false;

11
src/static/js/broadcast.js
View file

@ -20,14 +20,14 @@
* limitations under the License.
*/
define(['ep_etherpad-lite/static/js/pluginfw/hooks', 'ep_etherpad-lite/static/js/linestylefilter', 'ep_etherpad-lite/static/js/domline', 'underscore'], function (hooks, linetyleFilterMod, domlineMod, _) {
var exports = {};
var makeCSSManager = require('./cssmanager').makeCSSManager;
var domline = require('./domline').domline;
var domline = domlineMod.domline;
var AttribPool = require('./AttributePool');
var Changeset = require('./Changeset');
var linestylefilter = require('./linestylefilter').linestylefilter;
var linestylefilter = linetyleFilterMod.linestylefilter;
var colorutils = require('./colorutils').colorutils;
var _ = require('./underscore');
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
// These parameters were global, now they are injected. A reference to the
// Timeslider controller would probably be more appropriate.
@ -594,3 +594,6 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
}
exports.loadBroadcastJS = loadBroadcastJS;
return exports;
});

10
src/static/js/domline.js
View file

@ -26,10 +26,11 @@
// requires: plugins
// requires: undefined
define(['ep_etherpad-lite/static/js/pluginfw/hooks', 'ep_etherpad-lite/static/js/linestylefilter', 'underscore'], function(hooks, linestylefilterMod, _) {
var exports = {};
var Security = require('./security');
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
var _ = require('./underscore');
var lineAttributeMarker = require('./linestylefilter').lineAttributeMarker;
var lineAttributeMarker = linestylefilterMod.lineAttributeMarker;
var noop = function(){};
@ -319,3 +320,6 @@ domline.processSpaces = function(s, doesWrap)
};
exports.domline = domline;
return exports;
});

8
src/static/js/linestylefilter.js
View file

@ -28,10 +28,11 @@
// requires: plugins
// requires: undefined
define(['ep_etherpad-lite/static/js/pluginfw/hooks', 'underscore'], function (hooks, _) {
var exports = {};
var Changeset = require('./Changeset');
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
var linestylefilter = {};
var _ = require('./underscore');
var AttributeManager = require('./AttributeManager');
linestylefilter.ATTRIB_CLASSES = {
@ -363,3 +364,6 @@ linestylefilter.populateDomLine = function(textLine, aline, apool, domLineObj)
};
exports.linestylefilter = linestylefilter;
return exports;
});

16
src/static/js/timeslider.js
View file

@ -27,8 +27,9 @@ define([
'ep_etherpad-lite/static/js/rjquery',
'ep_etherpad-lite/static/js/pluginfw/hooks',
'ep_etherpad-lite/static/js/pad_utils',
'ep_etherpad-lite/static/js/broadcast_slider'
], function($, hooks, padUtilsMod, broadcastSliderMod) {
'ep_etherpad-lite/static/js/broadcast_slider',
'ep_etherpad-lite/static/js/broadcast',
], function($, hooks, padUtilsMod, broadcastSliderMod, broadcastMod) {
var exports = {};
JSON = window.requireKernel('./json2');
@ -36,6 +37,11 @@ define([
var createCookie = padUtilsMod.createCookie;
var readCookie = padUtilsMod.readCookie;
var randomString = padUtilsMod.randomString;
var broadcastRevisionsMod = require('./broadcast_revisions');
var padimpexpMod = require('./pad_impexp');
//initialize export ui
require('./pad_impexp').padimpexp.init();
var token, padId, export_links;
@ -142,11 +148,11 @@ define([
//load all script that doesn't work without the clientVars
BroadcastSlider = broadcastSliderMod.loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded);
require('./broadcast_revisions').loadBroadcastRevisionsJS();
changesetLoader = require('./broadcast').loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider);
broadcastRevisionsMod.loadBroadcastRevisionsJS();
changesetLoader = broadcastMod.loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider);
//initialize export ui
require('./pad_impexp').padimpexp.init();
padimpexpMod.padimpexp.init();
//change export urls when the slider moves
BroadcastSlider.onSlider(function(revno)

22
src/templates/pad.html
View file

@ -406,11 +406,9 @@
[
'ep_etherpad-lite/static/js/rjquery',
'ep_etherpad-lite/static/js/pluginfw/client_plugins',
'ep_etherpad-lite/static/js/pluginfw/hooks',
'ep_etherpad-lite/static/js/pad',
'ep_etherpad-lite/static/js/chat',
'ep_etherpad-lite/static/js/pad_editbar',
], function ($, plugins, hooks, padMod, chatMod, padEditbarMod) {
'ep_etherpad-lite/static/js/pluginfw/hooks'
], function ($, plugins, hooks) {
console.log("hooks & plugins modules loaded");
window.$ = $; // Expose jQuery #HACK
window.jQuery = $;
@ -423,14 +421,23 @@
plugins.update(function () {
hooks.plugins = plugins;
console.log("hooks.plugins initialized");
// Call documentReady hook
$(function() {
hooks.aCallAll('documentReady');
});
requirejs(
[
'ep_etherpad-lite/static/js/pad',
'ep_etherpad-lite/static/js/chat',
'ep_etherpad-lite/static/js/pad_editbar',
], function (padMod, chatMod, padEditbarMod) {
console.log("pad loaded");
padMod.baseURL = baseURL;
padMod.init();
});
/* TODO: These globals shouldn't exist. */
pad = padMod.pad;
@ -439,6 +446,9 @@
padimpexp = window.requireKernel('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
}
);
});
}
);
}());
</script>
<% e.end_block(); %>