Merge branch '4.0-dev' into feature/compile-es6

# Conflicts: # package.json
joomla · Feb 20, 2018 · 7179313 · 7179313
2 parents 345a666 + a354d8f
commit 7179313
Show file tree

Hide file tree

Showing 116 changed files with 19,333 additions and 20,195 deletions.
diff --git a/administrator/templates/atum/css/bootstrap.css b/administrator/templates/atum/css/bootstrap.css
diff --git a/administrator/templates/atum/css/template-rtl.css b/administrator/templates/atum/css/template-rtl.css
diff --git a/administrator/templates/atum/css/template.css b/administrator/templates/atum/css/template.css
diff --git a/media/plg_installer_webinstaller/css/client.css b/media/plg_installer_webinstaller/css/client.css
@@ -65,7 +65,6 @@
   height: 100%;
   margin-top: 5px;
   text-align: center;
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(70%, rgba(255, 255, 255, 0)), color-stop(95%, white));
   background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 70%, white 95%);
   background-repeat: repeat-x; }
 
@@ -91,10 +90,8 @@
   cursor: pointer; }
 
 .com-apps-container .list-container {
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box; }
+  box-sizing: border-box; }
   .com-apps-container .list-container .fader {
-    background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(255, 255, 255, 0)), color-stop(25%, white));
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 0%, white 25%);
     background-repeat: repeat-x; }
   .com-apps-container .list-container .list-group-item {

diff --git a/media/plg_installer_webinstaller/css/client.min.css b/media/plg_installer_webinstaller/css/client.min.css
diff --git a/media/vendor/awesomplete/css/awesomplete.css.map b/media/vendor/awesomplete/css/awesomplete.css.map
diff --git a/media/vendor/awesomplete/js/awesomplete.min.js.map b/media/vendor/awesomplete/js/awesomplete.min.js.map
diff --git a/media/vendor/codemirror/addon/hint/javascript-hint.js b/media/vendor/codemirror/addon/hint/javascript-hint.js
@@ -92,8 +92,8 @@
   var arrayProps = ("length concat join splice push pop shift unshift slice reverse sort indexOf " +
                     "lastIndexOf every some filter forEach map reduce reduceRight ").split(" ");
   var funcProps = "prototype apply call bind".split(" ");
-  var javascriptKeywords = ("break case catch continue debugger default delete do else false finally for function " +
-                  "if in instanceof new null return switch throw true try typeof var void while with").split(" ");
+  var javascriptKeywords = ("break case catch class const continue debugger default delete do else export extends false finally for function " +
+                  "if in import instanceof new null return super switch this throw true try typeof var void while with yield").split(" ");
   var coffeescriptKeywords = ("and break catch class continue delete do else extends false finally for " +
                   "if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");
 

diff --git a/media/vendor/codemirror/addon/hint/javascript-hint.min.js b/media/vendor/codemirror/addon/hint/javascript-hint.min.js
diff --git a/media/vendor/codemirror/addon/lint/javascript-lint.js b/media/vendor/codemirror/addon/lint/javascript-lint.js
@@ -51,7 +51,7 @@
         // Convert to format expected by validation service
         var hint = {
           message: error.reason,
-          severity: error.code.startsWith('W') ? "warning" : "error",
+          severity: error.code ? (error.code.startsWith('W') ? "warning" : "error") : "error",
           from: CodeMirror.Pos(error.line - 1, start),
           to: CodeMirror.Pos(error.line - 1, end)
         };

diff --git a/media/vendor/codemirror/addon/lint/javascript-lint.min.js b/media/vendor/codemirror/addon/lint/javascript-lint.min.js
diff --git a/media/vendor/codemirror/addon/search/match-highlighter.js b/media/vendor/codemirror/addon/search/match-highlighter.js
@@ -90,7 +90,7 @@
     var state = cm.state.matchHighlighter;
     cm.addOverlay(state.overlay = makeOverlay(query, hasBoundary, style));
     if (state.options.annotateScrollbar && cm.showMatchesOnScrollbar) {
-      var searchFor = hasBoundary ? new RegExp("\\b" + query + "\\b") : query;
+      var searchFor = hasBoundary ? new RegExp("\\b" + query.replace(/[\\\[+*?(){|^$]/g, "\\$&") + "\\b") : query;
       state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, false,
         {className: "CodeMirror-selection-highlight-scrollbar"});
     }