stylus - npm Package Compare versions

Comparing version 0.5.0 to 0.5.1

._History.md

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTR?!O��"
�"com.macromates.caret{
-    column = 17;
+Mac OS X        	2��ATTRQ�*��!
�!com.macromates.caret{
+    column = 0;
     line = 5;
 }

._package.json

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTR?!U��"
�"com.macromates.caret{
+Mac OS X        	2��ATTRQ�1��"
�"com.macromates.caret{
     column = 21;
     line = 2;
 }

History.md

 
+0.5.1 / 2011-02-11 
+==================
+
+  * Fixed mixin property ordering. Closes #125
+
 0.5.0 / 2011-02-09 
@@ -3,0 +8,0 @@ ==================

lib/._parser.js

@@ -1,4 +0,1 @@
-Mac OS X        	2��ATTR?!`��$
�$com.macromates.caret{
-    column = 15;
-    line = 323;
-}
+Mac OS X        	2��ATTRQ�:�� 
� com.macromates.caretx���R������<[k0?'3/«��

lib/._stylus.js

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTR?!e��#
�#com.macromates.caret{
+Mac OS X        	2��ATTRQ�>��#
�#com.macromates.caret{
     column = 24;
     line = 25;
 }

lib/lexer.js

@@ -580,3 +580,3 @@
     // url() special case
-    if (this.isURL && (captures = /^([^'"][^)]+) */.exec(this.str))) {
+    if (this.isURL && (captures = /^([^'")]+) */.exec(this.str))) {
       this.skip(captures);
@@ -583,0 +583,0 @@ return new Token('string', new nodes.String(captures[1]));

lib/stylus.js

@@ -26,3 +26,3 @@
 
-exports.version = '0.5.0';
+exports.version = '0.5.1';
 
@@ -29,0 +29,0 @@ /**

lib/visitor/evaluator.js

@@ -177,3 +177,2 @@
 
-
 /**
@@ -367,3 +366,3 @@ * Visit Call.
   // Function of the same name
-  if (call && !literal) {
+  if (call && !literal && !prop.literal) {
     this.calling.push(name);
@@ -379,2 +378,3 @@ var ret = this.visit(new nodes.Call(name, prop.expr));
     prop.name = name;
+    prop.literal = true;
     this.return = _;
@@ -391,3 +391,3 @@ return prop;
   for (var i = 0; i < block.nodes.length; ++i) {
-    this.rootIndex = i;
+    block.index = this.rootIndex = i;
     block.nodes[i] = this.visit(block.nodes[i]);
@@ -404,3 +404,4 @@ }
   if (block.scope) this.stack.push(new Frame(block));
-  for (var i = 0, len = block.nodes.length; i < len; ++i) {
+  for (var i = 0; i < block.nodes.length; ++i) {
+    block.index = i;
     block.nodes[i] = this.visit(block.nodes[i]);
@@ -609,3 +610,4 @@ }
 Evaluator.prototype.invoke = function(body){
-  var self = this;
+  var self = this
+    , block = this.stack.currentFrame.block;
 
@@ -617,3 +619,6 @@ // Return
   } else {
-    this.mixin(body.nodes, this.stack.currentFrame.block);
+    var head = block.nodes.slice(0, block.index)
+      , tail = block.nodes.slice(block.index + 1, block.nodes.length);
+    this.mixin(body.nodes, head);
+    block.nodes = head.concat(tail);
     return nodes.null;
@@ -624,10 +629,10 @@ }
 /**
- * Mixin the given `nodes`.
+ * Mixin the given `nodes` to the `dest` array.
  *
  * @param {Array} nodes
- * @param {Block} block
+ * @param {Array} dest
  * @api private
  */
 
-Evaluator.prototype.mixin = function(nodes, block){
+Evaluator.prototype.mixin = function(nodes, dest){
   var node
@@ -640,6 +645,6 @@ , len = nodes.length;
       case 'block':
-        this.mixin(node.nodes, block);
+        this.mixin(node.nodes, dest);
         break;
       default:
-        block.nodes.push(node);
+        dest.push(node);
     }
@@ -646,0 +651,0 @@ }

package.json

 {   "name": "stylus"
   , "description": "Robust, expressive language which compiles to CSS"
-  , "version": "0.5.0"
+  , "version": "0.5.1"
   , "author": "TJ Holowaychuk <[e-mail]>"
@@ -5,0 +5,0 @@ , "keywords": ["css", "parser", "style", "stylesheets", "jade", "language"]

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

175353

decreased by-0.44%

Number of package files

70

decreased by-7.89%

Lines of code

6451

decreased by-0.09%

No dependency changes