[Pkg-javascript-commits] [less.js] 10/10: 2.1.2 release
Jonas Smedegaard
dr at jones.dk
Mon Oct 26 23:26:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag v2.1.2
in repository less.js.
commit 97b06baea75b2c56e323fc562ff43ab6605ba6d6
Author: Luke Page <luke.a.page at gmail.com>
Date: Sat Dec 20 14:49:15 2014 +0000
2.1.2 release
---
CHANGELOG.md | 7 +++++++
bower.json | 2 +-
dist/less.js | 50 +++++++++++++++++++++++++++++++-------------------
dist/less.min.js | 12 ++++++------
lib/less/index.js | 2 +-
package.json | 2 +-
6 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22fb289..2f548a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 2.1.2
+
+2014-12-20
+
+ - Fix for use with requirejs
+ - Fixes for data-uri function
+
# 2.1.1
2014-11-27
diff --git a/bower.json b/bower.json
index bb7b11d..80305aa 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "less",
- "version": "2.1.1",
+ "version": "2.1.2",
"main": "dist/less.js",
"ignore": [
"**/.*",
diff --git a/dist/less.js b/dist/less.js
index 7eed064..fbbba14 100644
--- a/dist/less.js
+++ b/dist/less.js
@@ -1,5 +1,5 @@
/*!
- * Less - Leaner CSS v2.1.1
+ * Less - Leaner CSS v2.1.2
* http://lesscss.org
*
* Copyright (c) 2009-2014, Alexis Sellier <self at cloudhead.net>
@@ -794,7 +794,10 @@ module.exports = {
if (opt === "env" || opt === "dumpLineNumbers" || opt === "rootpath" || opt === "errorReporting") {
options[opt] = tag.dataset[opt];
} else {
- options[opt] = JSON.parse(tag.dataset[opt]);
+ try {
+ options[opt] = JSON.parse(tag.dataset[opt]);
+ }
+ catch(_) {}
}
}
}
@@ -1214,6 +1217,7 @@ abstractFileManager.prototype.extractUrlParts = function extractUrlParts(url, ba
module.exports = abstractFileManager;
},{}],15:[function(require,module,exports){
+var logger = require("../logger");
var environment = function(externalEnvironment, fileManagers) {
this.fileManagers = fileManagers || [];
externalEnvironment = externalEnvironment || {};
@@ -1234,6 +1238,14 @@ var environment = function(externalEnvironment, fileManagers) {
};
environment.prototype.getFileManager = function (filename, currentDirectory, options, environment, isSync) {
+
+ if (!filename) {
+ logger.warn("getFileManager called with no filename.. Please report this issue. continuing.");
+ }
+ if (currentDirectory == null) {
+ logger.warn("getFileManager called with null directory.. Please report this issue. continuing.");
+ }
+
var fileManagers = this.fileManagers;
if (options.pluginManager) {
fileManagers = [].concat(fileManagers).concat(options.pluginManager.getFileManagers());
@@ -1257,7 +1269,7 @@ environment.prototype.clearFileManagers = function () {
module.exports = environment;
-},{}],16:[function(require,module,exports){
+},{"../logger":31}],16:[function(require,module,exports){
var Color = require("../tree/color"),
functionRegistry = require("./function-registry");
@@ -1624,20 +1636,15 @@ module.exports = function(environment) {
functionRegistry.add("data-uri", function(mimetypeNode, filePathNode) {
- var mimetype = mimetypeNode.value;
- var filePath = (filePathNode && filePathNode.value);
-
- var fileManager = environment.getFileManager(filePath, this.context.currentFileInfo, this.context, environment, true);
-
- if (!fileManager) {
- return fallback(this, filePathNode || mimetypeNode);
+ if (!filePathNode) {
+ filePathNode = mimetypeNode;
+ mimetypeNode = null;
}
- var useBase64 = false;
-
- if (arguments.length < 2) {
- filePath = mimetype;
- }
+ var mimetype = mimetypeNode && mimetypeNode.value;
+ var filePath = filePathNode.value;
+ var currentDirectory = filePathNode.currentFileInfo.relativeUrls ?
+ filePathNode.currentFileInfo.currentDirectory : filePathNode.currentFileInfo.entryPath;
var fragmentStart = filePath.indexOf('#');
var fragment = '';
@@ -1646,11 +1653,16 @@ module.exports = function(environment) {
filePath = filePath.slice(0, fragmentStart);
}
- var currentDirectory = this.currentFileInfo.relativeUrls ?
- this.currentFileInfo.currentDirectory : this.currentFileInfo.entryPath;
+ var fileManager = environment.getFileManager(filePath, currentDirectory, this.context, environment, true);
+
+ if (!fileManager) {
+ return fallback(this, filePathNode);
+ }
+
+ var useBase64 = false;
// detect the mimetype if not given
- if (arguments.length < 2) {
+ if (!mimetypeNode) {
mimetype = environment.mimeLookup(filePath);
@@ -2222,7 +2234,7 @@ module.exports = function(environment, fileManagers) {
var SourceMapOutput, SourceMapBuilder, ParseTree, ImportManager, Environment;
var less = {
- version: [2, 1, 1],
+ version: [2, 1, 2],
data: require('./data'),
tree: require('./tree'),
Environment: (Environment = require("./environment/environment")),
diff --git a/dist/less.min.js b/dist/less.min.js
index 727a640..9478cf6 100644
--- a/dist/less.min.js
+++ b/dist/less.min.js
@@ -1,5 +1,5 @@
/*!
- * Less - Leaner CSS v2.1.1
+ * Less - Leaner CSS v2.1.2
* http://lesscss.org
*
* Copyright (c) 2009-2014, Alexis Sellier <self at cloudhead.net>
@@ -10,8 +10,8 @@
/** * @license Apache v2
*/
-!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;"undefined"!=typeof window?b=window:"undefined"!=typeof global?b=global:"undefined"!=typeof self&&(b=self),b.less=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.co [...]
-return d=d?d instanceof b?d.value:d.toCSS():"",new c(a.value,d)},"get-unit":function(a){return new f(a.unit)},extract:function(a,b){return b=b.value-1,Array.isArray(a.value)?a.value[b]:Array(a)[b]},length:function(a){var b=Array.isArray(a.value)?a.value.length:1;return new c(b)}})},{"../tree/anonymous":42,"../tree/color":46,"../tree/dimension":52,"../tree/keyword":61,"../tree/operation":67,"../tree/quoted":69,"../tree/url":76,"./function-registry":21}],28:[function(a,b){var c=a("./contex [...]
-},d.prototype.genCSS=function(a,b){b.add(this.toCSS(a))},d.prototype.toCSS=function(a){var b=this.key.toCSS?this.key.toCSS(a):this.key;return this.op&&(b+=this.op,b+=this.value.toCSS?this.value.toCSS(a):this.value),"["+b+"]"},b.exports=d},{"./node":66}],45:[function(a,b){var c=a("./node"),d=a("../functions/function-caller"),e=function(a,b,c,d){this.name=a,this.args=b,this.index=c,this.currentFileInfo=d};e.prototype=new c,e.prototype.type="Call",e.prototype.accept=function(a){this.args&&( [...]
-}finally{d&&(a.strictMath=!1)}},g.prototype.makeImportant=function(){return new g(this.name,this.value,"!important",this.merge,this.index,this.currentFileInfo,this.inline)},b.exports=g},{"./keyword":61,"./node":66,"./value":77}],71:[function(a,b){var c=a("./node"),d=a("./variable"),e=function(a){this.variable=a};e.prototype=new c,e.prototype.type="RulesetCall",e.prototype.eval=function(a){var b=new d(this.variable).eval(a);return b.callEval(a)},b.exports=e},{"./node":66,"./variable":78}] [...]
-j.port1.onmessage=c,h=function(){j.port2.postMessage(0)}}else h=function(){setTimeout(c,0)};b.exports=d}).call(this,a("_process"))},{_process:87}],91:[function(){"function"!=typeof Promise.prototype.done&&(Promise.prototype.done=function(){var a=arguments.length?this.then.apply(this,arguments):this;a.then(null,function(a){setTimeout(function(){throw a},0)})})},{}],"promise/polyfill.js":[function(a){a("asap");"undefined"==typeof Promise&&(Promise=a("./lib/core.js"),a("./lib/es6-extensions [...]
\ No newline at end of file
+!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;"undefined"!=typeof window?b=window:"undefined"!=typeof global?b=global:"undefined"!=typeof self&&(b=self),b.less=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.co [...]
+},ispixel:function(a){return k(a,"px")},ispercentage:function(a){return k(a,"%")},isem:function(a){return k(a,"em")},isunit:k,unit:function(a,d){if(!(a instanceof c))throw{type:"Argument",message:"the first argument to unit must be a number"+(a instanceof h?". Have you forgotten parenthesis?":"")};return d=d?d instanceof b?d.value:d.toCSS():"",new c(a.value,d)},"get-unit":function(a){return new f(a.unit)},extract:function(a,b){return b=b.value-1,Array.isArray(a.value)?a.value[b]:Array(a) [...]
+},b.exports=d},{"./node":66}],44:[function(a,b){var c=a("./node"),d=function(a,b,c){this.key=a,this.op=b,this.value=c};d.prototype=new c,d.prototype.type="Attribute",d.prototype.eval=function(a){return new d(this.key.eval?this.key.eval(a):this.key,this.op,this.value&&this.value.eval?this.value.eval(a):this.value)},d.prototype.genCSS=function(a,b){b.add(this.toCSS(a))},d.prototype.toCSS=function(a){var b=this.key.toCSS?this.key.toCSS(a):this.key;return this.op&&(b+=this.op,b+=this.value.t [...]
+var i=this.important,j=a.importantScope.pop();return!i&&j.important&&(i=j.important),new g(e,b,i,this.merge,this.index,this.currentFileInfo,this.inline,h)}catch(k){throw"number"!=typeof k.index&&(k.index=this.index,k.filename=this.currentFileInfo.filename),k}finally{d&&(a.strictMath=!1)}},g.prototype.makeImportant=function(){return new g(this.name,this.value,"!important",this.merge,this.index,this.currentFileInfo,this.inline)},b.exports=g},{"./keyword":61,"./node":66,"./value":77}],71:[f [...]
+if("undefined"!=typeof a&&a.nextTick)i=!0,h=function(){a.nextTick(c)};else if("function"==typeof setImmediate)h="undefined"!=typeof window?setImmediate.bind(window,c):function(){setImmediate(c)};else if("undefined"!=typeof MessageChannel){var j=new MessageChannel;j.port1.onmessage=c,h=function(){j.port2.postMessage(0)}}else h=function(){setTimeout(c,0)};b.exports=d}).call(this,a("_process"))},{_process:87}],91:[function(){"function"!=typeof Promise.prototype.done&&(Promise.prototype.done [...]
\ No newline at end of file
diff --git a/lib/less/index.js b/lib/less/index.js
index 51fd54c..0ada2e5 100644
--- a/lib/less/index.js
+++ b/lib/less/index.js
@@ -2,7 +2,7 @@ module.exports = function(environment, fileManagers) {
var SourceMapOutput, SourceMapBuilder, ParseTree, ImportManager, Environment;
var less = {
- version: [2, 1, 1],
+ version: [2, 1, 2],
data: require('./data'),
tree: require('./tree'),
Environment: (Environment = require("./environment/environment")),
diff --git a/package.json b/package.json
index 4fe9725..bf15be9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "less",
- "version": "2.1.1",
+ "version": "2.1.2",
"description": "Leaner CSS",
"homepage": "http://lesscss.org",
"author": {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/less.js.git
More information about the Pkg-javascript-commits
mailing list