Merge branch 'develop' of github.com:ether/etherpad-lite into develop

src/node/db/Pad.js

@@ -93,6 +93,7 @@ Pad.prototype.appendRevision = function appendRevision(aChangeset, author) {
   }
 
   if (newRev % 100 == 0) {
+    newRevData.meta.pool = this.pool;
     newRevData.meta.atext = this.atext;
   }
 

src/node/utils/Minify.js

@@ -23,8 +23,6 @@ var ERR = require("async-stacktrace");
 var settings = require('./Settings');
 var async = require('async');
 var fs = require('fs');
-var StringDecoder = require('string_decoder').StringDecoder;
-var CleanCSS = require('clean-css');
 var path = require('path');
 var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
 var RequireKernel = require('etherpad-require-kernel');

src/node/utils/MinifyWorker.js

@@ -3,13 +3,13 @@
  */
 
 var CleanCSS = require('clean-css');
-var uglifyJS = require("uglify-js");
+var terser = require("terser");
 var path = require('path');
 var Threads = require('threads')
 
 function compressJS(content)
 {
-  return uglifyJS.minify(content);
+  return terser.minify(content);
 }
 
 function compressCSS(filename, ROOT_DIR)

src/package.json

@@ -62,11 +62,11 @@
     "semver": "5.6.0",
     "slide": "1.1.6",
     "socket.io": "2.1.1",
+    "terser": "^4.7.0",
     "threads": "^1.4.0",
     "tiny-worker": "^2.3.0",
     "tinycon": "0.0.1",
     "ueberdb2": "0.4.9",
-    "uglify-js": "3.8.1",
     "underscore": "1.8.3",
     "unorm": "1.4.1"
   },

src/static/js/pad_editbar.js

@@ -484,7 +484,27 @@ var padeditbar = (function()
     });
 
     toolbar.registerAceCommand("clearauthorship", function (cmd, ace) {
-      if ((!(ace.ace_getRep().selStart && ace.ace_getRep().selEnd)) || ace.ace_isCaret()) {
+      // If we have the whole document selected IE control A has been hit
+      var rep = ace.ace_getRep();
+      var lastChar = rep.lines.atIndex(rep.lines.length()-1).width-1;
+      var lastLineIndex = rep.lines.length()-1;
+      if(rep.selStart[0] === 0 && rep.selStart[1] === 0){
+        // nesting intentionally here to make things readable
+        if(rep.selEnd[0] === lastLineIndex && rep.selEnd[1] === lastChar){
+          var doPrompt = true;
+        }
+      }
+      /*
+      * NOTICE: This command isn't fired on Control Shift C.
+      * I intentionally didn't create duplicate code because if you are hitting
+      * Control Shift C we make the assumption you are a "power user"
+      * and as such we assume you don't need the prompt to bug you each time!
+      * This does make wonder if it's worth having a checkbox to avoid being
+      * prompted again but that's probably overkill for this contribution.
+      */
+
+      // if we don't have any text selected, we have a caret or we have already said to prompt
+      if ((!(rep.selStart && rep.selEnd)) || ace.ace_isCaret() || doPrompt) {
         if (window.confirm(html10n.get("pad.editbar.clearcolors"))) {
           ace.ace_performDocumentApplyAttributesToCharRange(0, ace.ace_getRep().alltext.length, [
             ['author', '']

src/static/js/timeslider.js

@@ -141,13 +141,24 @@ function handleClientVars(message)
   //initialize export ui
   require('./pad_impexp').padimpexp.init();
 
+  // Create a base URI used for timeslider exports
+  var baseURI = document.location.pathname;
+
   //change export urls when the slider moves
   BroadcastSlider.onSlider(function(revno)
   {
     // export_links is a jQuery Array, so .each is allowed.
     export_links.each(function()
     {
-      this.setAttribute('href', this.href.replace( /(.+?)\/[^\/]+\/(\d+\/)?export/ , '$1/' + padId + '/' + revno + '/export'));
+      // Modified from regular expression to fix:
+      // https://github.com/ether/etherpad-lite/issues/4071
+      // Where a padId that was numeric would create the wrong export link
+      if(this.href){
+        var type = this.href.split('export/')[1];
+        var href = baseURI.split('timeslider')[0];
+        href += revno + '/export/' + type;
+        this.setAttribute('href', href);
+      }
     });
   });
 

test.js

@@ -1,77 +0,0 @@
-const Changeset        = require("./src/static/js/Changeset");
-const contentcollector = require("./src/static/js/contentcollector");
-const AttributePool    = require("./src/static/js/AttributePool");
-const cheerio          = require("./src/node_modules/cheerio");
-const util             = require('util');
-
-const tests = {
-  bulletListInOL:{
-    description : "A bullet within an OL should not change numbering..",
-    html : "<html><body><ol><li>should be 1</li><ul><li>should be a bullet</li></ul><li>should be 2</li></ol><p></p></body></html>",
-    expectedLineAttribs : [ '*0*1*2*3+1+b', '*0*4*2*5+1+i', '*0*1*2*5+1+b', '' ],
-    expectedText: ["*should be 1","*should be a bullet","*should be 2", ""]
-  }
-}
-
-// For each test..
-for (let test in tests){
-  let testObj = tests[test];
-
-//  describe(test, function() {
-//    it(testObj.description, function(done) {
-      var $ = cheerio.load(testObj.html);  // Load HTML into Cheerio
-      var doc = $('html')[0]; // Creates a dom-like representation of HTML
-      // Create an empty attribute pool
-      var apool = new AttributePool();
-      // Convert a dom tree into a list of lines and attribute liens
-      // using the content collector object
-      var cc = contentcollector.makeContentCollector(true, null, apool);
-      cc.collectContent(doc);
-      var result = cc.finish();
-      var recievedAttributes = result.lineAttribs;
-      var expectedAttributes = testObj.expectedLineAttribs;
-      var recievedText = new Array(result.lines)
-      var expectedText = testObj.expectedText;
-
-      // Check recieved text matches the expected text
-      if(arraysEqual(recievedText[0], expectedText)){
-        console.log("PASS: Recieved Text did match Expected Text\nRecieved:", recievedText[0], "\nExpected:", testObj.expectedText)
-      }else{
-         console.error("FAIL: Recieved Text did not match Expected Text\nRecieved:", recievedText[0], "\nExpected:", testObj.expectedText)
-        // throw new Error();
-      }
-
-      // Check recieved attributes matches the expected attributes
-      if(arraysEqual(recievedAttributes, expectedAttributes)){
-        console.log("PASS: Recieved Attributes matched Expected Attributes");
-        done();
-      }else{
-        console.error("FAIL", test, testObj.description);
-        console.error("FAIL: Recieved Attributes did not match Expected Attributes\nRecieved: ", recievedAttributes, "\nExpected: ", expectedAttributes)
-        console.error("FAILING HTML", testObj.html);
-        //throw new Error();
-      }
-//    });
-
-//  });
-
-};
-
-
-
-
-function arraysEqual(a, b) {
-  if (a === b) return true;
-  if (a == null || b == null) return false;
-  if (a.length != b.length) return false;
-
-  // If you don't care about the order of the elements inside
-  // the array, you should sort both arrays here.
-  // Please note that calling sort on an array will modify that array.
-  // you might want to clone your array first.
-
-  for (var i = 0; i < a.length; ++i) {
-    if (a[i] !== b[i]) return false;
-  }
-  return true;
-}

tests/backend/specs/api/importexport.js

@@ -0,0 +1,177 @@
+/*
+ * ACHTUNG: there is a copied & modified version of this file in
+ * <basedir>/tests/container/spacs/api/pad.js
+ *
+ * TODO: unify those two files, and merge in a single one.
+ */
+
+const assert = require('assert');
+const supertest = require(__dirname+'/../../../../src/node_modules/supertest');
+const fs = require('fs');
+const settings = require(__dirname+'/../../../../tests/container/loadSettings.js').loadSettings();
+const api = supertest('http://'+settings.ip+":"+settings.port);
+const path = require('path');
+const async = require(__dirname+'/../../../../src/node_modules/async');
+
+var filePath = path.join(__dirname, '../../../../APIKEY.txt');
+
+var apiKey = fs.readFileSync(filePath,  {encoding: 'utf-8'});
+apiKey = apiKey.replace(/\n$/, "");
+var apiVersion = 1;
+var lastEdited = "";
+
+var testImports = {
+  "malformed": {
+    input: '<html><body><li>wtf</ul></body></html>',
+    expectedHTML: '<!DOCTYPE HTML><html><body>wtf<br><br></body></html>',
+    expectedText: 'wtf\n\n'
+  },
+  "nonelistiteminlist #3620":{
+    input: '<html><body><ul>test<li>FOO</li></ul></body></html>',
+    expectedHTML: '<!DOCTYPE HTML><html><body><ul class="bullet">test<li>FOO</ul><br></body></html>',
+    expectedText: '\ttest\n\t* FOO\n\n'
+  },
+  "whitespaceinlist #3620":{
+    input: '<html><body><ul> <li>FOO</li></ul></body></html>',
+    expectedHTML: '<!DOCTYPE HTML><html><body><ul class="bullet"><li>FOO</ul><br></body></html>',
+    expectedText: '\t* FOO\n\n'
+  },
+  /*
+  "prefixcorrectlinenumber #3450":{
+    input: '<html><body><ol><li>should be 1</li>test<li>should be 2</li></ol></body></html>',
+    expectedHTML: '<!DOCTYPE HTML><html><body><ol start="1" class="number"><li>should be 1</li>test<li>should be 2</li></ol><br></body></html>',
+    expectedText: '\t1. should be 1\n\ttest\n\t2. should be 2\n\n'
+  }
+  ,
+  "newlinesshouldntresetlinenumber #2194":{
+    input: '<html><body><ol><li>should be 1</li>test<li>should be 2</li></ol></body></html>',
+    expectedHTML: '<!DOCTYPE HTML><html><body><ol class="number"><li>should be 1</li>test<li>should be 2</li></ol><br></body></html>',
+    expectedText: '\t1. should be 1\n\ttest\n\t2. should be 2\n\n'
+  }
+  */
+}
+
+Object.keys(testImports).forEach(function (testName) {
+  var testPadId = makeid();
+  test = testImports[testName];
+  describe('createPad', function(){
+    it('creates a new Pad', function(done) {
+      api.get(endPoint('createPad')+"&padID="+testPadId)
+      .expect(function(res){
+        if(res.body.code !== 0) throw new Error("Unable to create new Pad");
+      })
+      .expect('Content-Type', /json/)
+      .expect(200, done)
+    });
+  })
+
+  describe('setHTML', function(){
+    it('Sets the HTML', function(done) {
+      api.get(endPoint('setHTML')+"&padID="+testPadId+"&html="+test.input)
+      .expect(function(res){
+        if(res.body.code !== 0) throw new Error("Error:"+testName)
+      })
+      .expect('Content-Type', /json/)
+      .expect(200, done)
+    });
+  })
+
+  describe('getHTML', function(){
+    it('Gets back the HTML of a Pad', function(done) {
+      api.get(endPoint('getHTML')+"&padID="+testPadId)
+      .expect(function(res){
+        var receivedHtml = res.body.data.html;
+        if (receivedHtml !== test.expectedHTML) {
+          throw new Error(`HTML received from export is not the one we were expecting.
+             Test Name:
+             ${testName}
+
+             Received:
+             ${receivedHtml}
+
+             Expected:
+             ${test.expectedHTML}
+
+             Which is a different version of the originally imported one:
+             ${test.input}`);
+        }
+      })
+      .expect('Content-Type', /json/)
+      .expect(200, done)
+    });
+  })
+
+  describe('getText', function(){
+    it('Gets back the Text of a Pad', function(done) {
+      api.get(endPoint('getText')+"&padID="+testPadId)
+      .expect(function(res){
+        var receivedText = res.body.data.text;
+        if (receivedText !== test.expectedText) {
+          throw new Error(`Text received from export is not the one we were expecting.
+             Test Name:
+             ${testName}
+
+             Received:
+             ${receivedText}
+
+             Expected:
+             ${test.expectedText}
+
+             Which is a different version of the originally imported one:
+             ${test.input}`);
+        }
+      })
+      .expect('Content-Type', /json/)
+      .expect(200, done)
+    });
+  })
+});
+
+
+var endPoint = function(point, version){
+  version = version || apiVersion;
+  return '/api/'+version+'/'+point+'?apikey='+apiKey;
+}
+
+function makeid()
+{
+  var text = "";
+  var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+  for( var i=0; i < 5; i++ ){
+    text += possible.charAt(Math.floor(Math.random() * possible.length));
+  }
+  return text;
+}
+
+function generateLongText(){
+  var text = "";
+  var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+  for( var i=0; i < 80000; i++ ){
+    text += possible.charAt(Math.floor(Math.random() * possible.length));
+  }
+  return text;
+}
+
+// Need this to compare arrays (listSavedRevisions test)
+Array.prototype.equals = function (array) {
+    // if the other array is a falsy value, return
+    if (!array)
+        return false;
+    // compare lengths - can save a lot of time
+    if (this.length != array.length)
+        return false;
+    for (var i = 0, l=this.length; i < l; i++) {
+        // Check if we have nested arrays
+        if (this[i] instanceof Array && array[i] instanceof Array) {
+            // recurse into the nested arrays
+            if (!this[i].equals(array[i]))
+                return false;
+        } else if (this[i] != array[i]) {
+            // Warning - two different object instances will never be equal: {x:20} != {x:20}
+            return false;
+        }
+    }
+    return true;
+}

tests/frontend/specs/ordered_list.js

@@ -126,3 +126,80 @@ describe("assign ordered list", function(){
   }
 
 });
+
+describe("Pressing Tab in an OL increases and decreases indentation", function(){
+  //create a new pad before each test run
+  beforeEach(function(cb){
+    helper.newPad(cb);
+    this.timeout(60000);
+  });
+
+  it("indent and de-indent list item with keypress", function(done){
+    var inner$ = helper.padInner$;
+    var chrome$ = helper.padChrome$;
+
+    //get the first text element out of the inner iframe
+    var $firstTextElement = inner$("div").first();
+
+    //select this text element
+    $firstTextElement.sendkeys('{selectall}');
+
+    var $insertorderedlistButton = chrome$(".buttonicon-insertorderedlist");
+    $insertorderedlistButton.click();
+
+    var e = inner$.Event(helper.evtType);
+    e.keyCode = 9; // tab
+    inner$("#innerdocbody").trigger(e);
+
+    expect(inner$("div").first().find(".list-number2").length === 1).to.be(true);
+    e.shiftKey = true; // shift
+    e.keyCode = 9; // tab
+    inner$("#innerdocbody").trigger(e);
+
+    helper.waitFor(function(){
+      return inner$("div").first().find(".list-number1").length === 1;
+    }).done(done);
+
+  });
+
+
+});
+
+
+describe("Pressing indent/outdent button in an OL increases and decreases indentation and bullet / ol formatting", function(){
+  //create a new pad before each test run
+  beforeEach(function(cb){
+    helper.newPad(cb);
+    this.timeout(60000);
+  });
+
+  it("indent and de-indent list item with indent button", function(done){
+    var inner$ = helper.padInner$;
+    var chrome$ = helper.padChrome$;
+
+    //get the first text element out of the inner iframe
+    var $firstTextElement = inner$("div").first();
+
+    //select this text element
+    $firstTextElement.sendkeys('{selectall}');
+
+    var $insertorderedlistButton = chrome$(".buttonicon-insertorderedlist");
+    $insertorderedlistButton.click();
+
+    var $indentButton = chrome$(".buttonicon-indent");
+    $indentButton.click(); // make it indented twice
+
+    expect(inner$("div").first().find(".list-number2").length === 1).to.be(true);
+
+    var $outdentButton = chrome$(".buttonicon-outdent");
+    $outdentButton.click(); // make it deindented to 1
+
+    helper.waitFor(function(){
+      return inner$("div").first().find(".list-number1").length === 1;
+    }).done(done);
+
+  });
+
+
+});
+

tests/frontend/specs/timeslider_numeric_padID.js

@@ -0,0 +1,67 @@
+describe("timeslider", function(){
+  var padId = 735773577357+(Math.round(Math.random()*1000));
+
+  //create a new pad before each test run
+  beforeEach(function(cb){
+    helper.newPad(cb, padId);
+    this.timeout(60000);
+  });
+
+  it("Makes sure the export URIs are as expected when the padID is numeric", function(done) {
+    var inner$ = helper.padInner$;
+    var chrome$ = helper.padChrome$;
+
+    // make some changes to produce 100 revisions
+    var revs = 10;
+    this.timeout(60000);
+    for(var i=0; i < revs; i++) {
+      setTimeout(function() {
+        // enter 'a' in the first text element
+        inner$("div").first().sendkeys('a');
+      }, 100);
+    }
+
+    setTimeout(function() {
+      // go to timeslider
+      $('#iframe-container iframe').attr('src', $('#iframe-container iframe').attr('src')+'/timeslider');
+
+      setTimeout(function() {
+        var timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
+        var $sliderBar = timeslider$('#ui-slider-bar');
+
+        var latestContents = timeslider$('#padcontent').text();
+
+        // Expect the date and time to be shown
+
+        // Click somewhere on the timeslider
+        var e = new jQuery.Event('mousedown');
+        e.clientX = e.pageX = 150;
+        e.clientY = e.pageY = 45;
+        $sliderBar.trigger(e);
+
+        e = new jQuery.Event('mousedown');
+        e.clientX = e.pageX = 150;
+        e.clientY = e.pageY = 40;
+        $sliderBar.trigger(e);
+
+        e = new jQuery.Event('mousedown');
+        e.clientX = e.pageX = 150;
+        e.clientY = e.pageY = 50;
+        $sliderBar.trigger(e);
+
+        $sliderBar.trigger('mouseup')
+
+        setTimeout(function() {
+          // expect URI to be similar to
+          // http://192.168.1.48:9001/p/2/2/export/html
+          // http://192.168.1.48:9001/p/735773577399/0/export/html
+          var exportLink = timeslider$('#exporthtmla').attr('href');
+          var checkVal = padId + "/0/export/html";
+          var includesCorrectURI = exportLink.indexOf(checkVal);
+          expect(includesCorrectURI).to.not.be(-1);
+          done();
+        }, 400);
+      }, 2000);
+    }, 2000);
+  });
+});

tests/frontend/specs/unordered_list.js

@@ -33,3 +33,146 @@ describe("assign unordered list", function(){
   });
 
 });
+
+describe("unassign unordered list", function(){
+  //create a new pad before each test run
+  beforeEach(function(cb){
+    helper.newPad(cb);
+    this.timeout(60000);
+  });
+
+  it("insert unordered list text then remove by clicking list again", function(done){
+    var inner$ = helper.padInner$;
+    var chrome$ = helper.padChrome$;
+    var originalText = inner$("div").first().text();
+
+    var $insertunorderedlistButton = chrome$(".buttonicon-insertunorderedlist");
+    $insertunorderedlistButton.click();
+
+    helper.waitFor(function(){
+      var newText = inner$("div").first().text();
+      if(newText === originalText){
+        return inner$("div").first().find("ul li").length === 1;
+      }
+    }).done(function(){
+
+      // remove indentation by bullet and ensure text string remains the same
+      $insertunorderedlistButton.click();
+      helper.waitFor(function(){
+        var isList = inner$("div").find("ul").length === 1;
+        // sohuldn't be list
+        return (isList === false);
+      }).done(function(){
+        done();
+      });
+
+    });
+  });
+});
+
+
+describe("keep unordered list on enter key", function(){
+  //create a new pad before each test run
+  beforeEach(function(cb){
+    helper.newPad(cb);
+    this.timeout(60000);
+  });
+
+  it("Keeps the unordered list on enter for the new line", function(done){
+    var inner$ = helper.padInner$;
+    var chrome$ = helper.padChrome$;
+
+    var $insertorderedlistButton = chrome$(".buttonicon-insertunorderedlist");
+    $insertorderedlistButton.click();
+
+    //type a bit, make a line break and type again
+    var $firstTextElement = inner$("div span").first();
+    $firstTextElement.sendkeys('line 1');
+    $firstTextElement.sendkeys('{enter}');
+    $firstTextElement.sendkeys('line 2');
+    $firstTextElement.sendkeys('{enter}');
+
+    helper.waitFor(function(){
+      return inner$("div span").first().text().indexOf("line 2") === -1;
+    }).done(function(){
+      var $newSecondLine = inner$("div").first().next();
+      var hasULElement = $newSecondLine.find("ul li").length === 1;
+      console.log($newSecondLine.find("ul").length);
+      expect(hasULElement).to.be(true);
+      expect($newSecondLine.text()).to.be("line 2");
+      done();
+    });
+  });
+
+});
+
+describe("Pressing Tab in an UL increases and decreases indentation", function(){
+  //create a new pad before each test run
+  beforeEach(function(cb){
+    helper.newPad(cb);
+    this.timeout(60000);
+  });
+
+  it("indent and de-indent list item with keypress", function(done){
+    var inner$ = helper.padInner$;
+    var chrome$ = helper.padChrome$;
+
+    //get the first text element out of the inner iframe
+    var $firstTextElement = inner$("div").first();
+
+    //select this text element
+    $firstTextElement.sendkeys('{selectall}');
+
+    var $insertorderedlistButton = chrome$(".buttonicon-insertunorderedlist");
+    $insertorderedlistButton.click();
+
+    var e = inner$.Event(helper.evtType);
+    e.keyCode = 9; // tab
+    inner$("#innerdocbody").trigger(e);
+
+    expect(inner$("div").first().find(".list-bullet2").length === 1).to.be(true);
+    e.shiftKey = true; // shift
+    e.keyCode = 9; // tab
+    inner$("#innerdocbody").trigger(e);
+
+    helper.waitFor(function(){
+      return inner$("div").first().find(".list-bullet1").length === 1;
+    }).done(done);
+
+  });
+
+});
+
+describe("Pressing indent/outdent button in an UL increases and decreases indentation and bullet / ol formatting", function(){
+  //create a new pad before each test run
+  beforeEach(function(cb){
+    helper.newPad(cb);
+    this.timeout(60000);
+  });
+
+  it("indent and de-indent list item with indent button", function(done){
+    var inner$ = helper.padInner$;
+    var chrome$ = helper.padChrome$;
+
+    //get the first text element out of the inner iframe
+    var $firstTextElement = inner$("div").first();
+
+    //select this text element
+    $firstTextElement.sendkeys('{selectall}');
+
+    var $insertunorderedlistButton = chrome$(".buttonicon-insertunorderedlist");
+    $insertunorderedlistButton.click();
+
+    var $indentButton = chrome$(".buttonicon-indent");
+    $indentButton.click(); // make it indented twice
+
+    expect(inner$("div").first().find(".list-bullet2").length === 1).to.be(true);
+    var $outdentButton = chrome$(".buttonicon-outdent");
+    $outdentButton.click(); // make it deindented to 1
+
+    helper.waitFor(function(){
+      return inner$("div").first().find(".list-bullet1").length === 1;
+    }).done(done);
+  });
+});
+