less 2.4.0 → 2.5.0

data/lib/less/js/lib/source-map/source-map-footer.js

@@ -0,0 +1,4 @@
+// footer to wrap "source-map" module
+	return this.sourceMap;
+	}();
+})();

data/lib/less/js/lib/source-map/source-map-header.js

@@ -0,0 +1,3 @@
+// wraps the source-map code in a less module
+(function() {
+	less.modules["source-map"] = function() {

data/lib/less/js/package.json

@@ -1,9 +1,12 @@
 {
   "name": "less",
-  "version": "1.4.2",
+  "version": "1.6.2",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
-  "author": "Alexis Sellier <self@cloudhead.net>",
+  "author": {
+    "name": "Alexis Sellier",
+    "email": "self@cloudhead.net"
+  },
   "contributors": [
     "The Core Less Team"
   ],
@@ -14,6 +17,12 @@
     "type": "git",
     "url": "https://github.com/less/less.js.git"
   },
+  "licenses": [
+    {
+      "type": "Apache v2",
+      "url": "https://github.com/less/less.js/blob/master/LICENSE"
+    }
+  ],
   "bin": {
     "lessc": "./bin/lessc"
   },
@@ -22,23 +31,35 @@
     "test": "./test"
   },
   "jam": {
-    "main": "./dist/less-1.4.1.js"
+    "main": "./dist/less-1.5.0.js"
   },
   "engines": {
     "node": ">=0.4.2"
   },
   "scripts": {
-    "test": "make test"
+    "test": "grunt test"
   },
   "optionalDependencies": {
     "mime": "1.2.x",
     "request": ">=2.12.0",
-    "mkdirp": "~0.3.4",
-    "ycssmin": ">=1.0.1"
+    "mkdirp": "~0.3.5",
+    "clean-css": "2.0.x",
+    "source-map": "0.1.x"
   },
   "devDependencies": {
-    "diff": "~1.0"
-  },
+    "diff": "~1.0",
+    "grunt": "~0.4.1",
+    "grunt-contrib-clean": "~0.5.0",
+    "grunt-contrib-concat": "~0.3.0",
+    "grunt-contrib-connect": "~0.3.0",
+    "grunt-contrib-jasmine": "~0.5.2",
+    "grunt-contrib-jshint": "~0.7.2",
+    "grunt-contrib-uglify": "~0.2.7",
+    "grunt-shell": "~0.3.1",
+    "http-server": "~0.5.5",
+    "matchdep": "~0.1.2",
+    "time-grunt": "~0.1.1"
+ },
   "keywords": [
     "compile less",
     "css nesting",
@@ -63,11 +84,5 @@
     "stylesheet",
     "variables in css",
     "css less"
-  ],
-  "licenses": [
-    {
-      "type": "Apache v2",
-      "url": "https://github.com/less/less.js/blob/master/LICENSE"
-    }
   ]
-}
+}

data/lib/less/js/test/browser/common.js

@@ -1,99 +1,174 @@
-/*if not async then phantomjs fails to run the webserver and the test concurrently*/
-var less = { async: true, strictMath: true };
-
 /* record log messages for testing */
+// var logAllIds = function() {
+//   var allTags = document.head.getElementsByTagName('style');
+//   var ids = [];
+//   for (var tg = 0; tg < allTags.length; tg++) {
+//     var tag = allTags[tg];
+//     if (tag.id) {
+//       console.log(tag.id);
+//     }
+//   }
+// };
+
 var logMessages = [],
-    realConsoleLog = console.log;
+  realConsoleLog = console.log;
 console.log = function(msg) {
-    logMessages.push(msg);
-    realConsoleLog.call(console, msg);
+  logMessages.push(msg);
+  realConsoleLog.call(console, msg);
 };
 
 var testLessEqualsInDocument = function() {
-    testLessInDocument(testSheet);
+  testLessInDocument(testSheet);
 };
 
-var testLessErrorsInDocument = function() {
-    testLessInDocument(testErrorSheet);
+var testLessErrorsInDocument = function(isConsole) {
+    testLessInDocument(isConsole ? testErrorSheetConsole : testErrorSheet);
 };
 
 var testLessInDocument = function(testFunc) {
-    var links = document.getElementsByTagName('link'),
-        typePattern = /^text\/(x-)?less$/;
-
-    for (var i = 0; i < links.length; i++) {
-        if (links[i].rel === 'stylesheet/less' || (links[i].rel.match(/stylesheet/) &&
-           (links[i].type.match(typePattern)))) {
-            testFunc(links[i]);
-        }
+  var links = document.getElementsByTagName('link'),
+    typePattern = /^text\/(x-)?less$/;
+
+  for (var i = 0; i < links.length; i++) {
+    if (links[i].rel === 'stylesheet/less' || (links[i].rel.match(/stylesheet/) &&
+      (links[i].type.match(typePattern)))) {
+      testFunc(links[i]);
     }
+  }
 };
 
 var testSheet = function(sheet) {
-    it(sheet.id + " should match the expected output", function() {
-        var lessOutputId =  sheet.id.replace("original-", ""),
-            expectedOutputId = "expected-" + lessOutputId,
-            lessOutput = document.getElementById(lessOutputId).innerText,
-            expectedOutputHref = document.getElementById(expectedOutputId).href,
-            expectedOutput = loadFile(expectedOutputHref);
+  it(sheet.id + " should match the expected output", function() {
+    var lessOutputId = sheet.id.replace("original-", ""),
+      expectedOutputId = "expected-" + lessOutputId,
+      lessOutputObj,
+      lessOutput,
+      expectedOutputHref = document.getElementById(expectedOutputId).href,
+      expectedOutput = loadFile(expectedOutputHref);
+
+    // Browser spec generates less on the fly, so we need to loose control
+    waitsFor(function() {
+      lessOutputObj = document.getElementById(lessOutputId);
+      // the type condition is necessary because of inline browser tests
+      return lessOutputObj !== null && lessOutputObj.type === "text/css";
+    }, "generation of " + lessOutputId + "", 700);
+
+    runs(function() {
+      lessOutput = lessOutputObj.innerText || lessOutputObj.innerHTML;
+    });
 
-        waitsFor(function() {
-            return expectedOutput.loaded;
-        }, "failed to load expected outout", 10000);
-        
-        runs(function() {
-            // use sheet to do testing
-            expect(lessOutput).toEqual(expectedOutput.text);
-        });
+    waitsFor(function() {
+      return expectedOutput.loaded;
+    }, "failed to load expected outout", 10000);
+
+    runs(function() {
+      // use sheet to do testing
+            expect(expectedOutput.text).toEqual(lessOutput);
     });
+  });
 };
 
+//TODO: do it cleaner - the same way as in css
+
+function extractId(href) {
+  return href.replace(/^[a-z-]+:\/+?[^\/]+/, '') // Remove protocol & domain
+  .replace(/^\//, '') // Remove root /
+  .replace(/\.[a-zA-Z]+$/, '') // Remove simple extension
+  .replace(/[^\.\w-]+/g, '-') // Replace illegal characters
+  .replace(/\./g, ':'); // Replace dots with colons(for valid id)
+}
+
 var testErrorSheet = function(sheet) {
+  it(sheet.id + " should match an error", function() {
+    var lessHref = sheet.href,
+      id = "less-error-message:" + extractId(lessHref),
+      //            id = sheet.id.replace(/^original-less:/, "less-error-message:"),
+      errorHref = lessHref.replace(/.less$/, ".txt"),
+      errorFile = loadFile(errorHref),
+      actualErrorElement,
+      actualErrorMsg;
+
+    // Less.js sets 10ms timer in order to add error message on top of page.
+    waitsFor(function() {
+      actualErrorElement = document.getElementById(id);
+      return actualErrorElement !== null;
+    }, "error message was not generated", 70);
+
+    runs(function() {
+      actualErrorMsg = actualErrorElement.innerText
+        .replace(/\n\d+/g, function(lineNo) {
+        return lineNo + " ";
+      })
+        .replace(/\n\s*in /g, " in ")
+        .replace("\n\n", "\n");
+    });
+
+    waitsFor(function() {
+      return errorFile.loaded;
+    }, "failed to load expected outout", 10000);
+
+    runs(function() {
+      var errorTxt = errorFile.text
+        .replace("{path}", "")
+        .replace("{pathrel}", "")
+        .replace("{pathhref}", "http://localhost:8081/test/less/errors/")
+        .replace("{404status}", " (404)");
+      expect(errorTxt).toEqual(actualErrorMsg);
+      if (errorTxt == actualErrorMsg) {
+        actualErrorElement.style.display = "none";
+      }
+        });
+    });
+};
+
+var testErrorSheetConsole = function(sheet) {
     it(sheet.id + " should match an error", function() {
         var lessHref =  sheet.href,
             id = sheet.id.replace(/^original-less:/, "less-error-message:"),
             errorHref = lessHref.replace(/.less$/, ".txt"),
             errorFile = loadFile(errorHref),
             actualErrorElement = document.getElementById(id),
-            actualErrorMsg;
+            actualErrorMsg = logMessages[logMessages.length - 1];
 
         describe("the error", function() {
-            expect(actualErrorElement).not.toBe(null);
+            expect(actualErrorElement).toBe(null);
+
         });
-            
-        actualErrorMsg = actualErrorElement.innerText
-                .replace(/\n\d+/g, function(lineNo) { return lineNo + " "; })
-                .replace(/\n\s*in /g, " in ")
-                .replace("\n\n", "\n");
+
+        /*actualErrorMsg = actualErrorElement.innerText
+            .replace(/\n\d+/g, function(lineNo) { return lineNo + " "; })
+            .replace(/\n\s*in /g, " in ")
+            .replace("\n\n", "\n");*/
 
         waitsFor(function() {
             return errorFile.loaded;
         }, "failed to load expected outout", 10000);
-        
+
         runs(function() {
             var errorTxt = errorFile.text
                 .replace("{path}", "")
                 .replace("{pathrel}", "")
-                .replace("{pathhref}", "http://localhost:8081/less/errors/")
-                .replace("{404status}", " (404)");
-            expect(actualErrorMsg).toEqual(errorTxt);
-            if (errorTxt == actualErrorMsg) {
-                actualErrorElement.style.display = "none";
-            }
-        });
+                .replace("{pathhref}", "http://localhost:8081/browser/less/")
+                .replace("{404status}", " (404)")
+                .trim();
+            expect(errorTxt).toEqual(actualErrorMsg);
     });
+  });
 };
 
 var loadFile = function(href) {
-    var request = new XMLHttpRequest(),
-        response = { loaded: false, text: ""};
-    request.open('GET', href, true);
-    request.onload = function(e) {
-        response.text = request.response.replace(/\r/g, "");
-        response.loaded = true;
-    }
-    request.send();
-    return response;
+  var request = new XMLHttpRequest(),
+    response = {
+      loaded: false,
+      text: ""
+    };
+  request.open('GET', href, true);
+  request.onload = function(e) {
+    response.text = request.response.replace(/\r/g, "");
+    response.loaded = true;
+  };
+  request.send();
+  return response;
 };
 
 (function() {
@@ -119,7 +194,7 @@ var loadFile = function(href) {
 
   function execJasmine() {
     setTimeout(function() {
-        jasmineEnv.execute();
+      jasmineEnv.execute();
     }, 3000);
   }
 

data/lib/less/js/test/browser/css/global-vars/simple.css

@@ -0,0 +1,3 @@
+.test {
+  color: #ff0000;
+}

data/lib/less/js/test/browser/css/modify-vars/simple.css

@@ -0,0 +1,8 @@
+.testisimported {
+  color: gainsboro;
+}
+.test {
+  color1: #008000;
+  color2: #800080;
+  scalar: 20;
+}

data/lib/less/js/test/browser/css/relative-urls/urls.css

@@ -1,21 +1,20 @@
-@import "http://localhost:8081/browser/less/imports/modify-this.css";
-
-@import "http://localhost:8081/browser/less/imports/modify-again.css";
+@import "http://localhost:8081/test/browser/less/imports/modify-this.css";
+@import "http://localhost:8081/test/browser/less/imports/modify-again.css";
 .modify {
-  my-url: url("http://localhost:8081/browser/less/imports/a.png");
+  my-url: url("http://localhost:8081/test/browser/less/imports/a.png");
 }
 .modify {
-  my-url: url("http://localhost:8081/browser/less/imports/b.png");
+  my-url: url("http://localhost:8081/test/browser/less/imports/b.png");
 }
 @font-face {
   src: url("/fonts/garamond-pro.ttf");
-  src: local(Futura-Medium), url(http://localhost:8081/browser/less/relative-urls/fonts.svg#MyGeometricModern) format("svg");
+  src: local(Futura-Medium), url(http://localhost:8081/test/browser/less/relative-urls/fonts.svg#MyGeometricModern) format("svg");
 }
 #shorthands {
   background: url("http://www.lesscss.org/spec.html") no-repeat 0 4px;
 }
 #misc {
-  background-image: url(http://localhost:8081/browser/less/relative-urls/images/image.jpg);
+  background-image: url(http://localhost:8081/test/browser/less/relative-urls/images/image.jpg);
 }
 #data-uri {
   background: url(data:image/png;charset=utf-8;base64,
@@ -29,8 +28,8 @@
   background: transparent url('data:image/svg+xml, <svg version="1.1"><g></g></svg>');
 }
 .comma-delimited {
-  background: url(http://localhost:8081/browser/less/relative-urls/bg.jpg) no-repeat, url(http://localhost:8081/browser/less/relative-urls/bg.png) repeat-x top left, url(http://localhost:8081/browser/less/relative-urls/bg);
+  background: url(http://localhost:8081/test/browser/less/relative-urls/bg.jpg) no-repeat, url(http://localhost:8081/test/browser/less/relative-urls/bg.png) repeat-x top left, url(http://localhost:8081/test/browser/less/relative-urls/bg);
 }
 .values {
-  url: url('http://localhost:8081/browser/less/relative-urls/Trebuchet');
+  url: url('http://localhost:8081/test/browser/less/relative-urls/Trebuchet');
 }

data/lib/less/js/test/browser/css/rootpath-relative/urls.css

@@ -1,5 +1,4 @@
 @import "https://www.github.com/cloudhead/imports/modify-this.css";
-
 @import "https://www.github.com/cloudhead/imports/modify-again.css";
 .modify {
   my-url: url("https://www.github.com/cloudhead/imports/a.png");

data/lib/less/js/test/browser/css/rootpath/urls.css

@@ -1,5 +1,4 @@
 @import "https://www.github.com/modify-this.css";
-
 @import "https://www.github.com/modify-again.css";
 .modify {
   my-url: url("https://www.github.com/a.png");

data/lib/less/js/test/browser/css/urls.css

@@ -1,21 +1,20 @@
-@import "http://localhost:8081/browser/less/modify-this.css";
-
-@import "http://localhost:8081/browser/less/modify-again.css";
+@import "http://localhost:8081/test/browser/less/modify-this.css";
+@import "http://localhost:8081/test/browser/less/modify-again.css";
 .modify {
-  my-url: url("http://localhost:8081/browser/less/a.png");
+  my-url: url("http://localhost:8081/test/browser/less/a.png");
 }
 .modify {
-  my-url: url("http://localhost:8081/browser/less/b.png");
+  my-url: url("http://localhost:8081/test/browser/less/b.png");
 }
 @font-face {
   src: url("/fonts/garamond-pro.ttf");
-  src: local(Futura-Medium), url(http://localhost:8081/browser/less/fonts.svg#MyGeometricModern) format("svg");
+  src: local(Futura-Medium), url(http://localhost:8081/test/browser/less/fonts.svg#MyGeometricModern) format("svg");
 }
 #shorthands {
   background: url("http://www.lesscss.org/spec.html") no-repeat 0 4px;
 }
 #misc {
-  background-image: url(http://localhost:8081/browser/less/images/image.jpg);
+  background-image: url(http://localhost:8081/test/browser/less/images/image.jpg);
 }
 #data-uri {
   background: url(data:image/png;charset=utf-8;base64,
@@ -29,21 +28,26 @@
   background: transparent url('data:image/svg+xml, <svg version="1.1"><g></g></svg>');
 }
 .comma-delimited {
-  background: url(http://localhost:8081/browser/less/bg.jpg) no-repeat, url(http://localhost:8081/browser/less/bg.png) repeat-x top left, url(http://localhost:8081/browser/less/bg);
+  background: url(http://localhost:8081/test/browser/less/bg.jpg) no-repeat, url(http://localhost:8081/test/browser/less/bg.png) repeat-x top left, url(http://localhost:8081/test/browser/less/bg);
 }
 .values {
-  url: url('http://localhost:8081/browser/less/Trebuchet');
+  url: url('http://localhost:8081/test/browser/less/Trebuchet');
 }
 #data-uri {
-  uri: url('http://localhost:8081/browser/less/../../data/image.jpg');
+  uri: url('http://localhost:8081/test/data/image.jpg');
 }
 #data-uri-guess {
-  uri: url('http://localhost:8081/browser/less/../../data/image.jpg');
+  uri: url('http://localhost:8081/test/data/image.jpg');
 }
 #data-uri-ascii {
-  uri-1: url('http://localhost:8081/browser/less/../../data/page.html');
-  uri-2: url('http://localhost:8081/browser/less/../../data/page.html');
+  uri-1: url('http://localhost:8081/test/data/page.html');
+  uri-2: url('http://localhost:8081/test/data/page.html');
 }
 #data-uri-toobig {
-  uri: url('http://localhost:8081/browser/less/../../data/data-uri-fail.png');
+  uri: url('http://localhost:8081/test/data/data-uri-fail.png');
+}
+#svg-functions {
+  background-image: url('data:image/svg+xml,<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none"><linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" stop-color="#000000"/><stop offset="100%" stop-color="#ffffff"/></linearGradient><rect x="0" y="0" width="1" height="1" fill="url(#gradient)" /></svg>');
+  background-image: url('data:image/svg+xml,<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none"><linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" stop-color="#000000"/><stop offset="3%" stop-color="#ffa500"/><stop offset="100%" stop-color="#ffffff"/></linearGradient><rect x="0" y="0" width="1" height="1" fill="url(#gradient)" /></svg>');
+  background-image: url('data:image/svg+xml,<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none"><linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="1%" stop-color="#c4c4c4"/><stop offset="3%" stop-color="#ffa500"/><stop offset="5%" stop-color="#008000"/><stop offset="95%" stop-color="#ffffff"/></linearGradient><rect x="0" y="0" width="1" height="1" fill="url(#gradient)" /></svg>');
 }