Merge pull request #10240 from MarcelGerber/less-2

Marcel Gerber · Marcel Gerber · commit a71c8efc09b2 · 2015-09-13T14:22:18.000+02:00
Update LESS -&gt; 2.5.1
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -276,7 +276,7 @@ module.exports = function (grunt) {
                     'src/thirdparty/CodeMirror/addon/selection/active-line.js',
                     'src/thirdparty/mustache/mustache.js',
                     'src/thirdparty/path-utils/path-utils.min',
-                    'src/thirdparty/less-1.7.5.min.js'
+                    'src/thirdparty/less-2.5.1.min.js'
                 ],
                 helpers : [
                     'test/spec/PhantomHelper.js'
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
         "SHA": ""
     },
     "devDependencies": {
-        "grunt": "0.4.1",
+        "grunt": "0.4.5",
         "jasmine-node": "1.11.0",
         "grunt-jasmine-node": "0.1.0",
         "grunt-cli": "0.1.9",
@@ -27,7 +27,7 @@
         "grunt-contrib-clean": "0.4.1",
         "grunt-contrib-copy": "0.4.1",
         "grunt-contrib-htmlmin": "0.1.3",
-        "grunt-contrib-less": "0.8.2",
+        "grunt-contrib-less": "1.0.1",
         "grunt-contrib-requirejs": "0.4.1",
         "grunt-contrib-uglify": "0.2.0",
         "grunt-contrib-concat": "0.3.0",
diff --git a/src/LiveDevelopment/main.js b/src/LiveDevelopment/main.js
@@ -112,12 +112,11 @@ define(function main(require, exports, module) {
     
     /** Load Live Development LESS Style */
     function _loadStyles() {
-        var lessText    = require("text!LiveDevelopment/main.less"),
-            parser      = new less.Parser();
+        var lessText = require("text!LiveDevelopment/main.less");
         
-        parser.parse(lessText, function onParse(err, tree) {
+        less.render(lessText, function onParse(err, tree) {
             console.assert(!err, err);
-            ExtensionUtils.addEmbeddedStyleSheet(tree.toCSS());
+            ExtensionUtils.addEmbeddedStyleSheet(tree.css);
         });
     }
 
diff --git a/src/config.json b/src/config.json
@@ -36,7 +36,7 @@
         "SHA": ""
     },
     "devDependencies": {
-        "grunt": "0.4.1",
+        "grunt": "0.4.5",
         "jasmine-node": "1.11.0",
         "grunt-jasmine-node": "0.1.0",
         "grunt-cli": "0.1.9",
@@ -50,7 +50,7 @@
         "grunt-contrib-clean": "0.4.1",
         "grunt-contrib-copy": "0.4.1",
         "grunt-contrib-htmlmin": "0.1.3",
-        "grunt-contrib-less": "0.8.2",
+        "grunt-contrib-less": "1.0.1",
         "grunt-contrib-requirejs": "0.4.1",
         "grunt-contrib-uglify": "0.2.0",
         "grunt-contrib-concat": "0.3.0",
diff --git a/src/index.html b/src/index.html
@@ -46,8 +46,7 @@
 
     <!-- Pre-load third party scripts that cannot be async loaded. -->
     <!-- build:js thirdparty/thirdparty.min.js -->
-    <script src="thirdparty/less-config.js"></script>
-    <script src="thirdparty/less-1.7.5.min.js"></script>
+    <script src="thirdparty/less-2.5.1.min.js"></script>
     <script src="thirdparty/mustache/mustache.js"></script>
     <script src="thirdparty/jquery-2.1.3.min.js"></script>
     <!-- endbuild -->
diff --git a/src/styles/bootstrap/navbar.less b/src/styles/bootstrap/navbar.less
@@ -196,7 +196,7 @@
 .navbar-static-top .container,
 .navbar-fixed-top .container,
 .navbar-fixed-bottom .container {
-  #grid > .core > .span(@gridColumns);
+  .span(@gridColumns);
 }
 
 // Fixed to top
diff --git a/src/thirdparty/less-1.7.5.min.js b/src/thirdparty/less-1.7.5.min.js
diff --git a/src/thirdparty/less-2.5.1.min.js b/src/thirdparty/less-2.5.1.min.js
diff --git a/src/thirdparty/less-config.js b/src/thirdparty/less-config.js
diff --git a/src/utils/ExtensionUtils.js b/src/utils/ExtensionUtils.js
@@ -98,12 +98,10 @@ define(function (require, exports, module) {
             options;
         
         if (url) {
-            var dir  = url.slice(0, url.lastIndexOf("/") + 1),
-                file = url.slice(dir.length);
+            var dir = url.slice(0, url.lastIndexOf("/") + 1);
             
             options = {
-                filename: file,
-                paths:    [dir],
+                filename: url,
                 rootpath: dir
             };
 
@@ -118,16 +116,11 @@ define(function (require, exports, module) {
             }
         }
         
-        var parser = new less.Parser(options);
-        parser.parse(code, function onParse(err, tree) {
+        less.render(code, options, function onParse(err, tree) {
             if (err) {
                 result.reject(err);
             } else {
-                try {
-                    result.resolve(tree.toCSS());
-                } catch (toCSSError) {
-                    result.reject(toCSSError);
-                }
+                result.resolve(tree.css);
             }
         });
         
diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
@@ -162,16 +162,15 @@ define(function (require, exports, module) {
      */
     function lessifyTheme(content, theme) {
         var deferred = new $.Deferred();
-        var parser   = new less.Parser({
+
+        less.render("#editor-holder {" + content + "\n}", {
             rootpath: fixPath(stylesPath),
             filename: fixPath(theme.file._path)
-        });
-
-        parser.parse("#editor-holder {" + content + "\n}", function (err, tree) {
+        }, function (err, tree) {
             if (err) {
                 deferred.reject(err);
             } else {
-                deferred.resolve(tree.toCSS());
+                deferred.resolve(tree.css);
             }
         });
 
diff --git a/test/SpecRunner.html b/test/SpecRunner.html
@@ -38,7 +38,7 @@
   <script src="../src/thirdparty/jquery-2.1.3.min.js"></script>
   <script src="../src/thirdparty/mustache/mustache.js"></script>
   <script src="../src/thirdparty/path-utils/path-utils.js"></script>
-  <script src="../src/thirdparty/less-1.7.5.min.js"></script>
+  <script src="../src/thirdparty/less-2.5.1.min.js"></script>
   <script src="thirdparty/bootstrap2/js/bootstrap.min.js"></script>
     
   <!-- All other scripts are loaded through require. -->

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@`
`196`	`196`	`.navbar-static-top .container,`
`197`	`197`	`.navbar-fixed-top .container,`
`198`	`198`	`.navbar-fixed-bottom .container {`
`199`		`- #grid > .core > .span(@gridColumns);`
	`199`	`+ .span(@gridColumns);`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`// Fixed to top`