diff options
| author | Jose Antonio Marquez | 2012-04-02 10:40:05 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-04-02 10:40:05 -0700 |
| commit | b2f6ec0a6b08edac76cc77e1b57009bbb319abf5 (patch) | |
| tree | cb24d3a9db06d3ffc538f3558436f7bce29aa7fd /js/panels | |
| parent | e876941eaa6cf5adf0e028d0f3f9402284ea5de2 (diff) | |
| parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
| download | ninja-b2f6ec0a6b08edac76cc77e1b57009bbb319abf5.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Document
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, |