aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-30 15:42:14 -0700
committerValerio Virgillito2012-03-30 15:42:14 -0700
commit07badcfa96a7a9c9a99c6bd3812158e06704cdf6 (patch)
treefcce47fa512dd8a9502b822b9d0a535a77f457b2 /js
parentf4949cab544886702e7ad6eeaa6215125c7b067a (diff)
parent32654e945c0d44e0c293ddb32c67122b64673fd1 (diff)
downloadninja-07badcfa96a7a9c9a99c6bd3812158e06704cdf6.tar.gz
Merge pull request #151 from ericguzman/CSSPanel_AnimationDurationFix
CSS Panel - Fix animation duration value updates from "infinite" to int...
Diffstat (limited to 'js')
-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,