Merge pull request #647 from hannu/clean-default-var

Clean up default suffix on variable values
SC5 · Jun 9, 2015 · 4588b0b · 4588b0b
2 parents d910df7 + 3cbfe23
commit 4588b0b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/lib/app/js/app.js b/lib/app/js/app.js
@@ -164,7 +164,8 @@ angular.module('sgApp', [
       }
 
       angular.forEach(sortedVariables, function(variable) {
-        str = str.replace(new RegExp('\[\$\@]' + variable.name, 'g'), variable.value);
+        var cleanedValue = variable.value.replace(/\s*\!default$/, '');
+        str = str.replace(new RegExp('\[\$\@]' + variable.name, 'g'), cleanedValue);
       });
       return str;
     };

diff --git a/test/angular/unit/app.test.js b/test/angular/unit/app.test.js
@@ -87,6 +87,15 @@ describe('sgApp module', function() {
           result = 'background: $test;';
         expect(setVariables(input, variables)).to.eql(result);
       });
+
+      it('should clean up !default suffix', function() {
+        var input = 'background: $bgColor;',
+          variables = [
+            {name: 'bgColor', value: '#FF0000 !default'}
+          ],
+          result = 'background: #FF0000;';
+        expect(setVariables(input, variables)).to.eql(result);
+      });
     });
 
     describe('LESS "@" variables', function() {
@@ -127,6 +136,15 @@ describe('sgApp module', function() {
           result = 'background: @test;';
         expect(setVariables(input, variables)).to.eql(result);
       });
+
+      it('should clean up !default suffix', function() {
+        var input = 'background: @bgColor;',
+          variables = [
+            {name: 'bgColor', value: '#FF0000 !default'}
+          ],
+          result = 'background: #FF0000;';
+        expect(setVariables(input, variables)).to.eql(result);
+      });
     });
   });