diff options
author | Kruti Shah | 2012-07-16 16:28:57 -0700 |
---|---|---|
committer | Kruti Shah | 2012-07-16 16:28:57 -0700 |
commit | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (patch) | |
tree | a1c0985f584273990dcacdfaf9aeaddeb583d0b1 /js/panels/Timeline/Style.reel/Style.js | |
parent | cdcc677c827b65e3c689d4207c0117f94e4d6d57 (diff) | |
parent | 33e54da07d024ece1d52041d4ed2bcc28b8cbca3 (diff) | |
download | ninja-7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline/Style.reel/Style.js')
-rw-r--r-- | js/panels/Timeline/Style.reel/Style.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index dc159a01..930e1281 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.js | |||
@@ -232,7 +232,7 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
232 | set: function(newVal) { | 232 | set: function(newVal) { |
233 | if (this._whichView !== newVal) { | 233 | if (this._whichView !== newVal) { |
234 | if ((newVal !== "hintable") && (newVal !== "propval")) { | 234 | if ((newVal !== "hintable") && (newVal !== "propval")) { |
235 | this.log("Error: Unknown view -"+newVal+"- requested for style.js."); | 235 | console.log("Error: Unknown view -"+newVal+"- requested for style.js."); |
236 | return; | 236 | return; |
237 | } | 237 | } |
238 | this._whichView = newVal; | 238 | this._whichView = newVal; |