From 8eb43a3ebf7c1b7bd5474d8abff4223b995e911b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= <mba@fourplusone.de>
Date: Sun, 18 Mar 2012 09:05:46 +0100
Subject: [PATCH 1/7] replaceing AttributePoolFactory by AttributePool

---
 bin/convert.js                               |   4 +-
 src/node/db/Pad.js                           |   4 +-
 src/node/easysync_tests.js                   |  20 +--
 src/node/handler/PadMessageHandler.js        |   4 +-
 src/node/handler/TimesliderMessageHandler.js |   4 +-
 src/node/utils/tar.json                      |   4 +-
 src/static/js/AttributePoolFactory.js        | 124 +++++++++----------
 src/static/js/Changeset.js                   |   4 +-
 src/static/js/ace2_inner.js                  |   3 +-
 src/static/js/broadcast.js                   |   2 +-
 src/static/js/changesettracker.js            |   6 +-
 11 files changed, 90 insertions(+), 89 deletions(-)

diff --git a/bin/convert.js b/bin/convert.js
index 24fd393a5..ec792717e 100644
--- a/bin/convert.js
+++ b/bin/convert.js
@@ -6,7 +6,7 @@ var mysql = require("mysql");
 var async = require("async");
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
 var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
-var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory");
+var AttributePool = require("ep_etherpad-lite/static/js/AttributePool");
 
 var settingsFile = process.argv[2];
 var sqlOutputFile = process.argv[3];
@@ -384,7 +384,7 @@ function convertPad(padId, callback)
         }
         
         //generate the latest atext
-        var fullAPool = AttributePoolFactory.createAttributePool().fromJsonable(apool);
+        var fullAPool = (new AttributePool()).fromJsonable(apool);
         var keyRev = Math.floor(padmeta.head / padmeta.keyRevInterval) * padmeta.keyRevInterval;
         var atext = changesetsMeta[keyRev].atext;
         var curRev = keyRev;
diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js
index b69780a41..c384f172c 100644
--- a/src/node/db/Pad.js
+++ b/src/node/db/Pad.js
@@ -5,7 +5,7 @@
 
 var ERR = require("async-stacktrace");
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
-var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory");
+var AttributePool = require("ep_etherpad-lite/static/js/AttributePool");
 var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
 var db = require("./DB").db;
 var async = require("async");
@@ -28,7 +28,7 @@ exports.cleanText = function (txt) {
 var Pad = function Pad(id) {
 
   this.atext = Changeset.makeAText("\n");
-  this.pool = AttributePoolFactory.createAttributePool();
+  this.pool = new AttributePool();
   this.head = -1;
   this.chatHead = -1;
   this.publicStatus = false;
diff --git a/src/node/easysync_tests.js b/src/node/easysync_tests.js
index 7a1482897..374e949fd 100644
--- a/src/node/easysync_tests.js
+++ b/src/node/easysync_tests.js
@@ -22,7 +22,7 @@
 
 
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
-var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory");
+var AttributePool = require("ep_etherpad-lite/static/js/AttributePool");
 
 function random() {
   this.nextInt = function (maxValue) {
@@ -227,7 +227,7 @@ function runTests() {
       return attribs; // it's already an attrib pool
     } else {
       // assume it's an array of attrib strings to be split and added
-      var p = AttributePoolFactory.createAttributePool();
+      var p = new AttributePool();
       attribs.forEach(function (kv) {
         p.putAttrib(kv.split(','));
       });
@@ -325,7 +325,7 @@ function runTests() {
   runMutateAttributionTest(4, ['foo,bar', 'line,1', 'line,2', 'line,3', 'line,4', 'line,5'], "Z:5>1|2=2+1$x", ["?*1|1+1", "?*2|1+1", "*3|1+1", "?*4|1+1", "?*5|1+1"], ["?*1|1+1", "?*2|1+1", "+1*3|1+1", "?*4|1+1", "?*5|1+1"]);
 
   var testPoolWithChars = (function () {
-    var p = AttributePoolFactory.createAttributePool();
+    var p = new AttributePool();
     p.putAttrib(['char', 'newline']);
     for (var i = 1; i < 36; i++) {
       p.putAttrib(['char', Changeset.numToString(i)]);
@@ -560,7 +560,7 @@ function runTests() {
     var rand = new random();
     print("> testCompose#" + randomSeed);
 
-    var p = AttributePoolFactory.createAttributePool();
+    var p = new AttributePool();
 
     var startText = randomMultiline(10, 20, rand) + '\n';
 
@@ -594,7 +594,7 @@ function runTests() {
 
   (function simpleComposeAttributesTest() {
     print("> simpleComposeAttributesTest");
-    var p = AttributePoolFactory.createAttributePool();
+    var p = new AttributePool();
     p.putAttrib(['bold', '']);
     p.putAttrib(['bold', 'true']);
     var cs1 = Changeset.checkRep("Z:2>1*1+1*1=1$x");
@@ -604,7 +604,7 @@ function runTests() {
   })();
 
   (function followAttributesTest() {
-    var p = AttributePoolFactory.createAttributePool();
+    var p = new AttributePool();
     p.putAttrib(['x', '']);
     p.putAttrib(['x', 'abc']);
     p.putAttrib(['x', 'def']);
@@ -633,7 +633,7 @@ function runTests() {
     var rand = new random();
     print("> testFollow#" + randomSeed);
 
-    var p = AttributePoolFactory.createAttributePool();
+    var p = new AttributePool();
 
     var startText = randomMultiline(10, 20, rand) + '\n';
 
@@ -682,8 +682,8 @@ function runTests() {
   (function testMoveOpsToNewPool() {
     print("> testMoveOpsToNewPool");
 
-    var pool1 = AttributePoolFactory.createAttributePool();
-    var pool2 = AttributePoolFactory.createAttributePool();
+    var pool1 = new AttributePool();
+    var pool2 = new AttributePool();
 
     pool1.putAttrib(['baz', 'qux']);
     pool1.putAttrib(['foo', 'bar']);
@@ -738,7 +738,7 @@ function runTests() {
   (function testOpAttributeValue() {
     print("> testOpAttributeValue");
 
-    var p = AttributePoolFactory.createAttributePool();
+    var p = new AttributePool();
     p.putAttrib(['name', 'david']);
     p.putAttrib(['color', 'green']);
 
diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index e26bb46e9..b9ab6494d 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -23,7 +23,7 @@ var ERR = require("async-stacktrace");
 var async = require("async");
 var padManager = require("../db/PadManager");
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
-var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory");
+var AttributePool = require("ep_etherpad-lite/static/js/AttributePool");
 var authorManager = require("../db/AuthorManager");
 var readOnlyManager = require("../db/ReadOnlyManager");
 var settings = require('../utils/Settings');
@@ -368,7 +368,7 @@ function handleUserChanges(client, message)
   
   //get all Vars we need
   var baseRev = message.data.baseRev;
-  var wireApool = (AttributePoolFactory.createAttributePool()).fromJsonable(message.data.apool);
+  var wireApool = (new AttributePool()).fromJsonable(message.data.apool);
   var changeset = message.data.changeset;
       
   var r, apool, pad;
diff --git a/src/node/handler/TimesliderMessageHandler.js b/src/node/handler/TimesliderMessageHandler.js
index 0081e645d..da8597791 100644
--- a/src/node/handler/TimesliderMessageHandler.js
+++ b/src/node/handler/TimesliderMessageHandler.js
@@ -23,7 +23,7 @@ var ERR = require("async-stacktrace");
 var async = require("async");
 var padManager = require("../db/PadManager");
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
-var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory");
+var AttributePool = require("ep_etherpad-lite/static/js/AttributePool");
 var settings = require('../utils/Settings');
 var authorManager = require("../db/AuthorManager");
 var log4js = require('log4js');
@@ -265,7 +265,7 @@ function getChangesetInfo(padId, startNum, endNum, granularity, callback)
   var forwardsChangesets = [];
   var backwardsChangesets = [];
   var timeDeltas = [];
-  var apool = AttributePoolFactory.createAttributePool();
+  var apool = new AttributePool();
   var pad;
   var composedChangesets = {};
   var revisionDate = [];
diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json
index a905eb442..3f6550e77 100644
--- a/src/node/utils/tar.json
+++ b/src/node/utils/tar.json
@@ -39,7 +39,7 @@
   , "pad_modals.js"
   , "pad_savedrevs.js"
   , "pad_impexp.js"
-  , "AttributePoolFactory.js"
+  , "AttributePool.js"
   , "Changeset.js"
   , "domline.js"
   , "linestylefilter.js"
@@ -51,7 +51,7 @@
   ]
 , "ace2_inner.js": [
     "ace2_common.js"
-  , "AttributePoolFactory.js"
+  , "AttributePool.js"
   , "Changeset.js"
   , "security.js"
   , "skiplist.js"
diff --git a/src/static/js/AttributePoolFactory.js b/src/static/js/AttributePoolFactory.js
index 00b58dbb3..a9245daf8 100644
--- a/src/static/js/AttributePoolFactory.js
+++ b/src/static/js/AttributePoolFactory.js
@@ -22,69 +22,69 @@
  * 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;
+var AttributePool = function () {
+  this.numToAttrib = {}; // e.g. {0: ['foo','bar']}
+  this.attribToNum = {}; // e.g. {'foo,bar': 0}
+  this.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;
+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
   };
+};
 
-  p.getAttrib = function (num) {
-    var pair = p.numToAttrib[num];
-    if (!pair) {
-      return pair;
-    }
-    return [pair[0], pair[1]]; // return a mutable copy
-  };
+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;
+};
+  
 
-  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;
-}
+module.exports = AttributePool;
\ No newline at end of file
diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index fd1900ba7..738ee1bab 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 66f19faf1..d278254ff 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -43,7 +43,7 @@ var colorutils = require('./colorutils').colorutils;
 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;
@@ -51,6 +51,7 @@ var undoModule = require('./undomodule').undoModule;
 var makeVirtualLineView = require('./virtual_lines').makeVirtualLineView;
 
 function Ace2Inner(){
+
   var DEBUG = false; //$$ build script replaces the string "var DEBUG=true;//$$" with "var DEBUG=false;"
   // changed to false 
   var isSetUp = false;
diff --git a/src/static/js/broadcast.js b/src/static/js/broadcast.js
index 485db44fb..333e3b652 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 b02198526..58ef21cb5 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);
         }
 

From 902837f29580996643c99e3b00e74605691cd659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= <mba@fourplusone.de>
Date: Sun, 18 Mar 2012 09:06:29 +0100
Subject: [PATCH 2/7] renaming AttributePoolFactory

---
 src/static/js/{AttributePoolFactory.js => AttributePool.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/static/js/{AttributePoolFactory.js => AttributePool.js} (100%)

diff --git a/src/static/js/AttributePoolFactory.js b/src/static/js/AttributePool.js
similarity index 100%
rename from src/static/js/AttributePoolFactory.js
rename to src/static/js/AttributePool.js

From 38742401c97531d166ad5a02b4e45de913ec272f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= <mba@fourplusone.de>
Date: Sun, 18 Mar 2012 11:34:56 +0100
Subject: [PATCH 3/7] newSkipList() -> new SkipList()

---
 src/static/js/ace2_inner.js |  4 ++--
 src/static/js/skiplist.js   | 36 +++++++-----------------------------
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index d278254ff..f30a0467d 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -46,7 +46,7 @@ var domline = require('./domline').domline;
 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;
 
@@ -95,7 +95,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/skiplist.js b/src/static/js/skiplist.js
index 190bc55b9..2132d8e30 100644
--- a/src/static/js/skiplist.js
+++ b/src/static/js/skiplist.js
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
+var Ace2Common = require('./ace2_common');
+var noop = Ace2Common.noop;
+var extend = Ace2Common.extend;
 
-var noop = require('./ace2_common').noop;
-
-
-function newSkipList()
+function SkipList()
 {
   var PROFILER = window.PROFILER;
   if (!PROFILER)
@@ -284,27 +284,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)
   {
@@ -346,7 +325,7 @@ function newSkipList()
 The skip-list contains "entries", JavaScript objects that each must have a unique "key" property
 that is a string.
 */
-  var self = {
+  extend(this, {
     length: function()
     {
       return numNodes;
@@ -482,8 +461,7 @@ that is a string.
     {
       return start.levels;
     }
-  }
-  return self;
+  });
 }
 
-exports.newSkipList = newSkipList;
+module.exports = SkipList;

From c407ad3d3499ab1142b740fb0c6163be68e5dfe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= <mba@fourplusone.de>
Date: Fri, 23 Mar 2012 19:28:46 +0100
Subject: [PATCH 4/7] re-enabled maxAge setting. maxAge is now in seconds, not
 milliseconds.

---
 settings.json.template | 6 +++---
 src/node/server.js     | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/settings.json.template b/settings.json.template
index 6c0ebd385..3ae0a9815 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -39,9 +39,9 @@
      but makes it impossible to debug the javascript/css */
   "minify" : true,
 
-  /* How long may clients use served javascript code? Without versioning this
-    is may cause problems during deployment. */
-  "maxAge" : 21600000, // 6 hours
+  /* How long may clients use served javascript code (in seconds)? Without versioning this
+    is may cause problems during deployment. Set to 0 to disable caching */
+  "maxAge" : 21600, // 6 hours
   
   /* This is the path to the Abiword executable. Setting it to null, disables abiword.
      Abiword is needed to enable the import/export of pads*/  
diff --git a/src/node/server.js b/src/node/server.js
index 19df6e728..8e6d6fa0b 100644
--- a/src/node/server.js
+++ b/src/node/server.js
@@ -51,8 +51,9 @@ console.log("Report bugs at https://github.com/Pita/etherpad-lite/issues")
 
 var serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)";
 
-//cache 6 hours
-exports.maxAge = 1000*60*60*6;
+//cache 6 hours, by default
+var hour = 60*60;
+exports.maxAge = settings.maxAge || 6 * hour;
 
 //set loglevel
 log4js.setGlobalLogLevel(settings.loglevel);

From 8bf481f27baf99a1f6bed24c84f47080c33a8e15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= <mba@fourplusone.de>
Date: Sat, 24 Mar 2012 13:28:17 +0100
Subject: [PATCH 5/7] Send the Content-Type header for plugin-definitions.json
 in the right format

---
 src/node/hooks/express/static.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/hooks/express/static.js b/src/node/hooks/express/static.js
index e8f9afbb8..9209967ce 100644
--- a/src/node/hooks/express/static.js
+++ b/src/node/hooks/express/static.js
@@ -35,7 +35,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   // serve plugin definitions
   // not very static, but served here so that client can do require("pluginfw/static/js/plugin-definitions.js");
   args.app.get('/pluginfw/plugin-definitions.json', function (req, res, next) {
-    res.header("Content-Type","application/json; charset: utf-8");
+    res.header("Content-Type","application/json; charset=utf-8");
     res.write(JSON.stringify({"plugins": plugins.plugins, "parts": plugins.parts}));
     res.end();
   });

From 208d88cc036c6c2dda4f1746f7b17adbaec1a1a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= <mba@fourplusone.de>
Date: Sat, 24 Mar 2012 13:29:15 +0100
Subject: [PATCH 6/7] proceed if plugin-definitions.json didn't load properly

---
 src/static/js/pluginfw/plugins.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index c5c219032..1f3acab35 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -78,6 +78,9 @@ if (exports.isClient) {
       exports.hooks = exports.extractHooks(exports.parts, "client_hooks");
       exports.loaded = true;
       cb();
+     }).error(function(xhr, s, err){
+       console.error("Failed to load plugin-definitions: " + err);
+       cb();
      });
   }
 } else {

From e7ac8d6d4a890f4b9fe88dbd8f04427937f4bd19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= <mba@fourplusone.de>
Date: Tue, 27 Mar 2012 11:44:21 +0200
Subject: [PATCH 7/7] use underscore in skipList

---
 src/static/js/skiplist.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/static/js/skiplist.js b/src/static/js/skiplist.js
index 2132d8e30..58477acca 100644
--- a/src/static/js/skiplist.js
+++ b/src/static/js/skiplist.js
@@ -20,9 +20,10 @@
  * limitations under the License.
  */
 
-var Ace2Common = require('./ace2_common');
+var Ace2Common = require('./ace2_common'),
+  _ = require('./underscore');
+
 var noop = Ace2Common.noop;
-var extend = Ace2Common.extend;
 
 function SkipList()
 {
@@ -324,8 +325,9 @@ function SkipList()
 /*
 The skip-list contains "entries", JavaScript objects that each must have a unique "key" property
 that is a string.
-*/
-  extend(this, {
+  */
+  var self = this;
+  _.extend(this, {
     length: function()
     {
       return numNodes;