summaryrefslogtreecommitdiff
path: root/src/static/js
diff options
context:
space:
mode:
Diffstat (limited to 'src/static/js')
-rw-r--r--src/static/js/AttributePool.js90
-rw-r--r--src/static/js/AttributePoolFactory.js90
-rw-r--r--src/static/js/Changeset.js4
-rw-r--r--src/static/js/ace2_inner.js7
-rw-r--r--src/static/js/broadcast.js2
-rw-r--r--src/static/js/changesettracker.js6
-rw-r--r--src/static/js/pad_editor.js4
-rw-r--r--src/static/js/pluginfw/plugins.js72
-rw-r--r--src/static/js/skiplist.js38
9 files changed, 149 insertions, 164 deletions
diff --git a/src/static/js/AttributePool.js b/src/static/js/AttributePool.js
new file mode 100644
index 00000000..a9245daf
--- /dev/null
+++ b/src/static/js/AttributePool.js
@@ -0,0 +1,90 @@
+/**
+ * This code represents the Attribute Pool Object of the original Etherpad.
+ * 90% of the code is still like in the original Etherpad
+ * Look at https://github.com/ether/pad/blob/master/infrastructure/ace/www/easysync2.js
+ * You can find a explanation what a attribute pool is here:
+ * https://github.com/Pita/etherpad-lite/blob/master/doc/easysync/easysync-notes.txt
+ */
+
+/*
+ * Copyright 2009 Google Inc., 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var AttributePool = function () {
+ this.numToAttrib = {}; // e.g. {0: ['foo','bar']}
+ this.attribToNum = {}; // e.g. {'foo,bar': 0}
+ this.nextNum = 0;
+};
+
+AttributePool.prototype.putAttrib = function (attrib, dontAddIfAbsent) {
+ var str = String(attrib);
+ if (str in this.attribToNum) {
+ return this.attribToNum[str];
+ }
+ if (dontAddIfAbsent) {
+ return -1;
+ }
+ var num = this.nextNum++;
+ this.attribToNum[str] = num;
+ this.numToAttrib[num] = [String(attrib[0] || ''), String(attrib[1] || '')];
+ return num;
+};
+
+AttributePool.prototype.getAttrib = function (num) {
+ var pair = this.numToAttrib[num];
+ if (!pair) {
+ return pair;
+ }
+ return [pair[0], pair[1]]; // return a mutable copy
+};
+
+AttributePool.prototype.getAttribKey = function (num) {
+ var pair = this.numToAttrib[num];
+ if (!pair) return '';
+ return pair[0];
+};
+
+AttributePool.prototype.getAttribValue = function (num) {
+ var pair = this.numToAttrib[num];
+ if (!pair) return '';
+ return pair[1];
+};
+
+AttributePool.prototype.eachAttrib = function (func) {
+ for (var n in this.numToAttrib) {
+ var pair = this.numToAttrib[n];
+ func(pair[0], pair[1]);
+ }
+};
+
+AttributePool.prototype.toJsonable = function () {
+ return {
+ numToAttrib: this.numToAttrib,
+ nextNum: this.nextNum
+ };
+};
+
+AttributePool.prototype.fromJsonable = function (obj) {
+ this.numToAttrib = obj.numToAttrib;
+ this.nextNum = obj.nextNum;
+ this.attribToNum = {};
+ for (var n in this.numToAttrib) {
+ this.attribToNum[String(this.numToAttrib[n])] = Number(n);
+ }
+ return this;
+};
+
+
+module.exports = AttributePool; \ No newline at end of file
diff --git a/src/static/js/AttributePoolFactory.js b/src/static/js/AttributePoolFactory.js
deleted file mode 100644
index 00b58dbb..00000000
--- a/src/static/js/AttributePoolFactory.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * This code represents the Attribute Pool Object of the original Etherpad.
- * 90% of the code is still like in the original Etherpad
- * Look at https://github.com/ether/pad/blob/master/infrastructure/ace/www/easysync2.js
- * You can find a explanation what a attribute pool is here:
- * https://github.com/Pita/etherpad-lite/blob/master/doc/easysync/easysync-notes.txt
- */
-
-/*
- * Copyright 2009 Google Inc., 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS-IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-exports.createAttributePool = function () {
- var p = {};
- p.numToAttrib = {}; // e.g. {0: ['foo','bar']}
- p.attribToNum = {}; // e.g. {'foo,bar': 0}
- p.nextNum = 0;
-
- p.putAttrib = function (attrib, dontAddIfAbsent) {
- var str = String(attrib);
- if (str in p.attribToNum) {
- return p.attribToNum[str];
- }
- if (dontAddIfAbsent) {
- return -1;
- }
- var num = p.nextNum++;
- p.attribToNum[str] = num;
- p.numToAttrib[num] = [String(attrib[0] || ''), String(attrib[1] || '')];
- return num;
- };
-
- p.getAttrib = function (num) {
- var pair = p.numToAttrib[num];
- if (!pair) {
- return pair;
- }
- return [pair[0], pair[1]]; // return a mutable copy
- };
-
- p.getAttribKey = function (num) {
- var pair = p.numToAttrib[num];
- if (!pair) return '';
- return pair[0];
- };
-
- p.getAttribValue = function (num) {
- var pair = p.numToAttrib[num];
- if (!pair) return '';
- return pair[1];
- };
-
- p.eachAttrib = function (func) {
- for (var n in p.numToAttrib) {
- var pair = p.numToAttrib[n];
- func(pair[0], pair[1]);
- }
- };
-
- p.toJsonable = function () {
- return {
- numToAttrib: p.numToAttrib,
- nextNum: p.nextNum
- };
- };
-
- p.fromJsonable = function (obj) {
- p.numToAttrib = obj.numToAttrib;
- p.nextNum = obj.nextNum;
- p.attribToNum = {};
- for (var n in p.numToAttrib) {
- p.attribToNum[String(p.numToAttrib[n])] = Number(n);
- }
- return p;
- };
-
- return p;
-}
diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index fd1900ba..738ee1ba 100644
--- a/src/static/js/Changeset.js
+++ b/src/static/js/Changeset.js
@@ -25,7 +25,7 @@
* limitations under the License.
*/
-var AttributePoolFactory = require("./AttributePoolFactory");
+var AttributePool = require("./AttributePool");
var _opt = null;
@@ -1731,7 +1731,7 @@ exports.appendATextToAssembler = function (atext, assem) {
* @param pool {AtributePool}
*/
exports.prepareForWire = function (cs, pool) {
- var newPool = AttributePoolFactory.createAttributePool();;
+ var newPool = new AttributePool();
var newCs = exports.moveOpsToNewPool(cs, pool, newPool);
return {
translated: newCs,
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index a831bb04..f8393d0b 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -21,7 +21,6 @@
*/
var editor, _, $, jQuery, plugins, Ace2Common;
-
Ace2Common = require('./ace2_common');
plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
@@ -44,10 +43,10 @@ function Ace2Inner(){
var makeContentCollector = require('./contentcollector').makeContentCollector;
var makeCSSManager = require('./cssmanager').makeCSSManager;
var domline = require('./domline').domline;
- var AttribPool = require('./AttributePoolFactory').createAttributePool;
+ var AttribPool = require('./AttributePool');
var Changeset = require('./Changeset');
var linestylefilter = require('./linestylefilter').linestylefilter;
- var newSkipList = require('./skiplist').newSkipList;
+ var SkipList = require('./skiplist');
var undoModule = require('./undomodule').undoModule;
var makeVirtualLineView = require('./virtual_lines').makeVirtualLineView;
@@ -93,7 +92,7 @@ function Ace2Inner(){
// native IE selections have that behavior (which we try not to interfere with).
// Must be false if selection is collapsed!
var rep = {
- lines: newSkipList(),
+ lines: new SkipList(),
selStart: null,
selEnd: null,
selFocusAtStart: false,
diff --git a/src/static/js/broadcast.js b/src/static/js/broadcast.js
index f8b6341d..1c7bdcfd 100644
--- a/src/static/js/broadcast.js
+++ b/src/static/js/broadcast.js
@@ -22,7 +22,7 @@
var makeCSSManager = require('./cssmanager').makeCSSManager;
var domline = require('./domline').domline;
-var AttribPool = require('./AttributePoolFactory').createAttributePool;
+var AttribPool = require('./AttributePool');
var Changeset = require('./Changeset');
var linestylefilter = require('./linestylefilter').linestylefilter;
var colorutils = require('./colorutils').colorutils;
diff --git a/src/static/js/changesettracker.js b/src/static/js/changesettracker.js
index b0219852..58ef21cb 100644
--- a/src/static/js/changesettracker.js
+++ b/src/static/js/changesettracker.js
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-var AttribPool = require('./AttributePoolFactory').createAttributePool;
+var AttributePool = require('./AttributePool');
var Changeset = require('./Changeset');
function makeChangesetTracker(scheduler, apool, aceCallbacksProvider)
@@ -83,7 +83,7 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider)
baseAText = Changeset.cloneAText(atext);
if (apoolJsonObj)
{
- var wireApool = (new AttribPool()).fromJsonable(apoolJsonObj);
+ var wireApool = (new AttributePool()).fromJsonable(apoolJsonObj);
baseAText.attribs = Changeset.moveOpsToNewPool(baseAText.attribs, wireApool, apool);
}
submittedChangeset = null;
@@ -117,7 +117,7 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider)
if (apoolJsonObj)
{
- var wireApool = (new AttribPool()).fromJsonable(apoolJsonObj);
+ var wireApool = (new AttributePool()).fromJsonable(apoolJsonObj);
c = Changeset.moveOpsToNewPool(c, wireApool, apool);
}
diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js
index 12f83aeb..b8a4ea0e 100644
--- a/src/static/js/pad_editor.js
+++ b/src/static/js/pad_editor.js
@@ -87,8 +87,6 @@ var padeditor = (function()
return defaultValue;
}
- self.ace.setProperty("showsauthorcolors", !settings.noColors);
-
self.ace.setProperty("rtlIsTrue", settings.rtlIsTrue);
var v;
@@ -100,6 +98,8 @@ var padeditor = (function()
v = getOption('showAuthorColors', true);
self.ace.setProperty("showsauthorcolors", v);
padutils.setCheckbox($("#options-colorscheck"), v);
+ // Override from parameters
+ self.ace.setProperty("showsauthorcolors", !settings.noColors);
v = getOption('useMonospaceFont', false);
self.ace.setProperty("textface", (v ? "monospace" : "Arial, sans-serif"));
diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index 7eb82d38..5f44bb6f 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -12,10 +12,9 @@ if (!exports.isClient) {
var fs = require("fs");
var tsort = require("./tsort");
var util = require("util");
- var extend = require("node.extend");
_ = require("underscore");
}else{
- var $, jQuery
+ var $, jQuery;
$ = jQuery = require("ep_etherpad-lite/static/js/rjquery").$;
_ = require("ep_etherpad-lite/static/js/underscore");
}
@@ -31,15 +30,15 @@ exports.ensure = function (cb) {
exports.update(cb);
else
cb();
-}
+};
exports.formatPlugins = function () {
return _.keys(exports.plugins).join(", ");
-}
+};
exports.formatParts = function () {
return _.map(exports.parts, function (part) { return part.full_name; }).join("\n");
-}
+};
exports.formatHooks = function () {
var res = [];
@@ -49,33 +48,39 @@ exports.formatHooks = function () {
});
});
return res.join("\n");
-}
+};
-exports.loadFn = function (path) {
+exports.loadFn = function (path, hookName) {
var x = path.split(":");
var fn = require(x[0]);
- _.each(x[1].split("."), function (name) {
+ var functionName = x[1] ? x[1] : hookName;
+
+ _.each(functionName.split("."), function (name) {
fn = fn[name];
});
return fn;
-}
+};
exports.extractHooks = function (parts, hook_set_name) {
var hooks = {};
_.each(parts,function (part) {
- _.chain(part[hook_set_name] || {}).keys().each(function (hook_name) {
+ _.chain(part[hook_set_name] || {})
+ .keys()
+ .each(function (hook_name) {
if (hooks[hook_name] === undefined) hooks[hook_name] = [];
+
+
var hook_fn_name = part[hook_set_name][hook_name];
- var hook_fn = exports.loadFn(part[hook_set_name][hook_name]);
+ var hook_fn = exports.loadFn(hook_fn_name, hook_name);
if (hook_fn) {
hooks[hook_name].push({"hook_name": hook_name, "hook_fn": hook_fn, "hook_fn_name": hook_fn_name, "part": part});
} else {
- console.error("Unable to load hook function for " + part.full_name + " for hook " + hook_name + ": " + part.hooks[hook_name]);
+ console.error("Unable to load hook function for " + part.full_name + " for hook " + hook_name + ": " + part.hooks[hook_name]);
}
});
});
return hooks;
-}
+};
if (exports.isClient) {
@@ -90,7 +95,7 @@ if (exports.isClient) {
console.error("Failed to load plugin-definitions: " + err);
cb();
});
- }
+ };
} else {
exports.callInit = function (cb) {
@@ -135,7 +140,7 @@ exports.update = function (cb) {
}
);
});
-}
+ };
exports.getPackages = function (cb) {
// Load list of installed NPM packages, flatten it to a list, and filter out only packages with names that
@@ -145,49 +150,50 @@ exports.getPackages = function (cb) {
var packages = {};
function flatten(deps) {
_.chain(deps).keys().each(function (name) {
- if (name.indexOf(exports.prefix) == 0) {
- packages[name] = extend({}, deps[name]);
+ if (name.indexOf(exports.prefix) === 0) {
+ packages[name] = _.clone(deps[name]);
// Delete anything that creates loops so that the plugin
// list can be sent as JSON to the web client
delete packages[name].dependencies;
delete packages[name].parent;
- }
- if (deps[name].dependencies !== undefined)
- flatten(deps[name].dependencies);
+ }
+
+ if (deps[name].dependencies !== undefined) flatten(deps[name].dependencies);
});
}
+
var tmp = {};
tmp[data.name] = data;
flatten(tmp);
cb(null, packages);
});
-}
+ };
-exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) {
+ exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) {
var plugin_path = path.resolve(packages[plugin_name].path, "ep.json");
fs.readFile(
plugin_path,
function (er, data) {
if (er) {
- console.error("Unable to load plugin definition file " + plugin_path);
+ console.error("Unable to load plugin definition file " + plugin_path);
return cb();
}
try {
var plugin = JSON.parse(data);
- plugin.package = packages[plugin_name];
- plugins[plugin_name] = plugin;
- _.each(plugin.parts, function (part) {
- part.plugin = plugin_name;
- part.full_name = plugin_name + "/" + part.name;
- parts[part.full_name] = part;
- });
+ plugin['package'] = packages[plugin_name];
+ plugins[plugin_name] = plugin;
+ _.each(plugin.parts, function (part) {
+ part.plugin = plugin_name;
+ part.full_name = plugin_name + "/" + part.name;
+ parts[part.full_name] = part;
+ });
} catch (ex) {
- console.error("Unable to parse plugin definition file " + plugin_path + ": " + ex.toString());
+ console.error("Unable to parse plugin definition file " + plugin_path + ": " + ex.toString());
}
cb();
}
);
-}
+ };
exports.partsToParentChildList = function (parts) {
var res = [];
@@ -203,7 +209,7 @@ exports.partsToParentChildList = function (parts) {
}
});
return res;
-}
+};
// Used only in Node, so no need for _
diff --git a/src/static/js/skiplist.js b/src/static/js/skiplist.js
index 190bc55b..58477acc 100644
--- a/src/static/js/skiplist.js
+++ b/src/static/js/skiplist.js
@@ -20,11 +20,12 @@
* limitations under the License.
*/
+var Ace2Common = require('./ace2_common'),
+ _ = require('./underscore');
-var noop = require('./ace2_common').noop;
+var noop = Ace2Common.noop;
-
-function newSkipList()
+function SkipList()
{
var PROFILER = window.PROFILER;
if (!PROFILER)
@@ -284,27 +285,6 @@ function newSkipList()
}
return dist;
}
-/*function _debugToString() {
- var array = [start];
- while (array[array.length-1] !== end) {
- array[array.length] = array[array.length-1].downPtrs[0];
- }
- function getIndex(node) {
- if (!node) return null;
- for(var i=0;i<array.length;i++) {
- if (array[i] === node)
- return i-1;
- }
- return false;
- }
- var processedArray = map(array, function(node) {
- var x = {key:node.key, levels: node.levels, downSkips: node.downSkips,
- upPtrs: map(node.upPtrs, getIndex), downPtrs: map(node.downPtrs, getIndex),
- downSkipWidths: node.downSkipWidths};
- return x;
- });
- return map(processedArray, function (x) { return x.toSource(); }).join("\n");
- }*/
function _getNodeByKey(key)
{
@@ -345,8 +325,9 @@ function newSkipList()
/*
The skip-list contains "entries", JavaScript objects that each must have a unique "key" property
that is a string.
-*/
- var self = {
+ */
+ var self = this;
+ _.extend(this, {
length: function()
{
return numNodes;
@@ -482,8 +463,7 @@ that is a string.
{
return start.levels;
}
- }
- return self;
+ });
}
-exports.newSkipList = newSkipList;
+module.exports = SkipList;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 02:25:54 +0000