Merge pull request #2479 from ether/export-privacy

Export privacy

src/node/utils/ExportEtherpad.js

@@ -48,6 +48,7 @@ exports.getPadRaw = function(padId, callback){
 
               // Get the author info
               db.get("globalAuthor:"+authorId, function(e, authorEntry){
+                authorEntry.padIDs = padId;
                 if(!e) data["globalAuthor:"+authorId] = authorEntry;
               });
 

src/node/utils/ImportEtherpad.js

@@ -24,12 +24,25 @@ exports.setPadRaw = function(padId, records, callback){
   async.eachSeries(Object.keys(records), function(key, cb){
     var value = records[key]
 
-    // we know its an author
+    // Author data
     if(value.padIDs){
       // rewrite author pad ids
       value.padIDs[padId] = 1;
       var newKey = key;
 
+      // Does this author already exist?
+      db.get(key, function(err, author){
+        if(author){
+          // Yes, add the padID to the author..
+          author.padIDs.push(padId);
+          value = author;
+        }else{
+          // No, create a new array with the author info in
+          value.padIDs = [padId];
+        }
+      });
+
+    // Not author data, probably pad data
     }else{
       // we can split it to look to see if its pad data
       var oldPadId = key.split(":");

tests/frontend/specs/bold.js

@@ -43,9 +43,8 @@ describe("bold button", function(){
 
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
-    console.log(inner$(window)[0].bowser);
 
-    if(inner$(window)[0].bowser.firefox){ // if it's a mozilla browser
+    if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.msie){ // if it's a mozilla or IE 
       var evtType = "keypress";
     }else{
       var evtType = "keydown";

tests/frontend/specs/caret.js

@@ -297,7 +297,7 @@ function prepareDocument(n, target){ // generates a random document with random
 }
 
 function keyEvent(target, charCode, ctrl, shift){ // sends a charCode to the window
-  if(inner$(window)[0].bowser.firefox){ // if it's a mozilla browser
+  if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.msie){ // if it's a mozilla or IE  
     var evtType = "keypress";
   }else{
     var evtType = "keydown";

tests/frontend/specs/indentation.js

@@ -15,7 +15,7 @@ describe("indentation button", function(){
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
 
-    if(inner$(window)[0].bowser.firefox){ // if it's a mozilla browser
+    if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.msie){ // if it's a mozilla or IE  
       var evtType = "keypress";
     }else{
       var evtType = "keydown";

tests/frontend/specs/italic.js

@@ -44,7 +44,7 @@ describe("italic some text", function(){
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
 
-    if(inner$(window)[0].bowser.firefox){ // if it's a mozilla browser
+    if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.msie){ // if it's a mozilla or IE  
       var evtType = "keypress";
     }else{
       var evtType = "keydown";

tests/frontend/specs/redo.js

@@ -47,7 +47,7 @@ describe("undo button then redo button", function(){
     var modifiedValue = $firstTextElement.text(); // get the modified value
     expect(modifiedValue).not.to.be(originalValue); // expect the value to change
 
-    if(inner$(window)[0].bowser.firefox){ // if it's a mozilla browser
+    if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.msie){ // if it's a mozilla or IE  
       var evtType = "keypress";
     }else{
       var evtType = "keydown";