Merge branch '3.5.0-dev'

gulpfile.js

@@ -79,7 +79,7 @@ function miniAdmin () {
     './src/main/webapp/js/admin/others.js',
     './src/main/webapp/js/admin/linkList.js',
     './src/main/webapp/js/admin/preference.js',
-    './src/main/webapp/js/admin/theme-list.js',
+    './src/main/webapp/js/admin/themeList.js',
     './src/main/webapp/js/admin/pluginList.js',
     './src/main/webapp/js/admin/userList.js',
     './src/main/webapp/js/admin/categoryList.js',

src/main/webapp/js/admin/admin.js

@@ -233,7 +233,7 @@ $.extend(Admin.prototype, {
     }, 6000)
     $('#loadMsg').text('')
 
-    window.onbeforeunload = (event) => {
+    window.onbeforeunload = function (event) {
       if (window.location.hash === '#article/article') {
         if (event) {
           event.returnValue = Label.editorLeaveLabel
@@ -244,7 +244,7 @@ $.extend(Admin.prototype, {
 
     $(document).ajaxError(function (event, xhr, options, exc) {
       if (xhr.status !== 200) {
-        $('#tipMsg').text(xhr.status + ': '+ exc)
+        $('#tipMsg').text(xhr.status + ': ' + exc)
       }
     })
   },

skins @ a5d63c72

-Subproject commit 87265b97bce95132ea233903c3e91f9b101a31ca
+Subproject commit a5d63c72257319eefc2c90fec1961765413d3ff9