diff options
author | Jonathan Duran | 2012-04-03 08:12:52 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-03 08:12:52 -0700 |
commit | 937271dc08894961e48a0e230d0bdcd17b01dc97 (patch) | |
tree | 50ddeacf252f91581bff725c6dc690e18fdaa723 /js/panels | |
parent | 7bcc6c6873778a19afb5b7f77e5b7e2e8deedd94 (diff) | |
parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
download | ninja-937271dc08894961e48a0e230d0bdcd17b01dc97.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js | 4 |
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() { | |||
1691 | NJCSSStyle.prototype.getUnits = function(val) { | 1691 | NJCSSStyle.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, |