diff options
author | Ananya Sen | 2012-04-06 12:48:52 -0700 |
---|---|---|
committer | Ananya Sen | 2012-04-06 12:48:52 -0700 |
commit | 0f6cee34ae696f72c7bedc23b7aaa0b1e08b5f6b (patch) | |
tree | 02c10700fa61602206fcd9793f4aa04842670bc9 /js/controllers | |
parent | 8acdde3e87f8cabd179a068c54fe5b78fa38e40d (diff) | |
parent | 7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff) | |
download | ninja-0f6cee34ae696f72c7bedc23b7aaa0b1e08b5f6b.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into bug-fixes
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/document-controller.js | 2 | ||||
-rw-r--r-- | js/controllers/presets-controller.js | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 0f02ca3c..ddaeb061 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -71,7 +71,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
71 | handleAddComponentFirstDraw: { | 71 | handleAddComponentFirstDraw: { |
72 | value: function (e) { | 72 | value: function (e) { |
73 | //TODO: Add logic to reparse the document for dynamically added styles | 73 | //TODO: Add logic to reparse the document for dynamically added styles |
74 | console.log(e); | 74 | //console.log(e); |
75 | } | 75 | } |
76 | }, | 76 | }, |
77 | 77 | ||
diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js index 975f9f7a..4c177189 100644 --- a/js/controllers/presets-controller.js +++ b/js/controllers/presets-controller.js | |||
@@ -72,20 +72,19 @@ exports.PresetsController = Montage.create(Component, { | |||
72 | selectorBase = stylesController.generateClassName(selectorBase); | 72 | selectorBase = stylesController.generateClassName(selectorBase); |
73 | 73 | ||
74 | selection.forEach(function(element) { | 74 | selection.forEach(function(element) { |
75 | var el = element._element, | 75 | var animationName; |
76 | animationName; | ||
77 | 76 | ||
78 | if(useTransition) { | 77 | if(useTransition) { |
79 | this.addTransition(el); | 78 | this.addTransition(element); |
80 | } | 79 | } |
81 | 80 | ||
82 | ///// TODO: remove when we find out what to do with competing animations | 81 | ///// TODO: remove when we find out what to do with competing animations |
83 | animationName = stylesController.getElementStyle(el, '-webkit-animation-name'); | 82 | animationName = stylesController.getElementStyle(element, '-webkit-animation-name'); |
84 | if(animationName) { | 83 | if(animationName) { |
85 | animationNames.push(animationName); | 84 | animationNames.push(animationName); |
86 | } | 85 | } |
87 | 86 | ||
88 | el.classList.add(selectorBase); | 87 | element.classList.add(selectorBase); |
89 | 88 | ||
90 | }, this); | 89 | }, this); |
91 | 90 | ||