From 32654e945c0d44e0c293ddb32c67122b64673fd1 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Thu, 29 Mar 2012 17:09:57 -0700 Subject: CSS Panel - Fix animation duration value updates from "infinite" to integer. --- js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/panels/CSSPanel/CSSPanelBase.reel') 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() { NJCSSStyle.prototype.getUnits = function(val) { if(val.split(/\s/).length > 1) { return false; - } else if(/px|em|pt|in|cm|mm|ex|pc|%/.test(val)) { + } else if(/(px|em|pt|in|cm|mm|ex|pc|%)$/.test(val)) { return val.replace(/^.*(px|em|pt|in|cm|mm|ex|pc|%).*/, '$1'); } return null; @@ -1771,7 +1771,7 @@ NJCSSStyle.prototype.updateValue = function(newValue, bypassUndo) { this.styleChange(); return true; } - + var IMPORTANT_FLAG = ' !important', dec = this.njRule.declaration, acceptAsValid = false, -- cgit v1.2.3