Merge new release into master branch!

ether · Apr 9, 2018 · 8c1020f · 8c1020f
2 parents 6a38826 + c9b090b
commit 8c1020f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/src/locales/zh-hant.json b/src/locales/zh-hant.json
@@ -117,7 +117,7 @@
 	"timeslider.month.october": "10月",
 	"timeslider.month.november": "11月",
 	"timeslider.month.december": "12月",
-	"timeslider.unnamedauthors": "{{num}}匿名{[plural(num) 作者]}",
+	"timeslider.unnamedauthors": "{{num}} 個匿名{[plural(num) one:作者, other:作者]}",
 	"pad.savedrevs.marked": "標記此修訂版本為已儲存修訂版本。",
 	"pad.savedrevs.timeslider": "您可使用時段滑標來查看先前保存的版本內容",
 	"pad.userlist.entername": "輸入您的姓名",

diff --git a/src/node/hooks/express/apicalls.js b/src/node/hooks/express/apicalls.js
@@ -3,7 +3,7 @@ var apiLogger = log4js.getLogger("API");
 var clientLogger = log4js.getLogger("client");
 var formidable = require('formidable');
 var apiHandler = require('../../handler/APIHandler');
-var isValidJSONPName = require('./isValidJsonPName');
+var isValidJSONPName = require('./isValidJSONPName');
 
 //This is for making an api call, collecting all post information and passing it to the apiHandler
 var apiCaller = function(req, res, fields) {

diff --git a/src/package.json b/src/package.json
@@ -55,6 +55,6 @@
   "repository"     : { "type" : "git",
                        "url" : "http://github.com/ether/etherpad-lite.git"
                      },
-  "version"        : "1.6.4",
+  "version"        : "1.6.5",
   "license"        : "Apache-2.0"
 }
diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css
@@ -33,7 +33,7 @@ body.grayedout { background-color: #eee !important }
 #innerdocbody {
   font-size: 16px; /* overridden by body.style */
   font-family:Arial, sans-serif; /* overridden by body.style */
-  line-height: 16px; /* overridden by body.style */
+  line-height: 22px; /* overridden by body.style */
   background-color: white;
   color: black;
 }
@@ -62,11 +62,9 @@ body.doesWrap {
   white-space: normal;
 }
 
-@-moz-document url-prefix() {
-  body.doesWrap:not(.noprewrap) > div{
-    /* Related to #1766 */
-    white-space: pre-wrap;
-  }
+body.doesWrap:not(.noprewrap) > div{
+  /* Related to #1766 */
+  white-space: pre-wrap;
 }
 
 #innerdocbody {

diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
@@ -79,12 +79,17 @@ $(document).ready(function () {
 
       for (attr in plugin) {
         if(attr == "name"){ // Hack to rewrite URLS into name
-          row.find(".name").html("<a target='_blank' title='Plugin details' href='https://npmjs.org/package/"+plugin['name']+"'>"+plugin['name'].substr(3)+"</a>"); // remove 'ep_'
-        }else{
+          var link = $('<a>');
+          link.attr('href', 'https://npmjs.org/package/'+plugin['name']);
+          link.attr('plugin', 'Plugin details');
+          link.attr('target', '_blank');
+          link.text(plugin['name'].substr(3));
+          row.find('.name').append(link);
+        } else {
           row.find("." + attr).text(plugin[attr]);
         }
       }
-      row.find(".version").html( plugin.version );
+      row.find(".version").text(plugin.version);
       row.addClass(plugin.name)
       row.data('plugin', plugin.name)
       container.append(row);