aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-03 15:07:07 -0700
committerPushkar Joshi2012-04-03 15:07:07 -0700
commit12f988a32da12731ab35104128e396a6f388aeae (patch)
tree1333043a3d5573f32bcaaf8df9955aef5e2e9720 /js/panels
parent79fb912bdaa22b8107bbddc93d1779820af80cf9 (diff)
parentc6de22bf42be90b403491b5f87b1818d9020310c (diff)
downloadninja-12f988a32da12731ab35104128e396a6f388aeae.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
index 0c950ffd..ecf0f9cd 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
@@ -1691,7 +1691,7 @@ NJCSSStyle.prototype.styleChange = function() {
1691NJCSSStyle.prototype.getUnits = function(val) { 1691NJCSSStyle.prototype.getUnits = function(val) {
1692 if(val.split(/\s/).length > 1) { 1692 if(val.split(/\s/).length > 1) {
1693 return false; 1693 return false;
1694 } else if(/px|em|pt|in|cm|mm|ex|pc|%/.test(val)) { 1694 } else if(/(px|em|pt|in|cm|mm|ex|pc|%)$/.test(val)) {
1695 return val.replace(/^.*(px|em|pt|in|cm|mm|ex|pc|%).*/, '$1'); 1695 return val.replace(/^.*(px|em|pt|in|cm|mm|ex|pc|%).*/, '$1');
1696 } 1696 }
1697 return null; 1697 return null;
@@ -1771,7 +1771,7 @@ NJCSSStyle.prototype.updateValue = function(newValue, bypassUndo) {
1771 this.styleChange(); 1771 this.styleChange();
1772 return true; 1772 return true;
1773 } 1773 }
1774 1774
1775 var IMPORTANT_FLAG = ' !important', 1775 var IMPORTANT_FLAG = ' !important',
1776 dec = this.njRule.declaration, 1776 dec = this.njRule.declaration,
1777 acceptAsValid = false, 1777 acceptAsValid = false,