aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-29 11:50:17 -0700
committerNivesh Rajbhandari2012-06-29 11:50:17 -0700
commit81d75ac08ff24dc3078d79a9133e54f592c23026 (patch)
tree4f4136503c87a72f7af67a54dad69c14469ee01e /js/controllers
parent01783536d2245b474eb1f89df673bfabb006cbdd (diff)
parentecd9e3b3b09695e3e7115c04e75add5a20c5c6fe (diff)
downloadninja-81d75ac08ff24dc3078d79a9133e54f592c23026.tar.gz
Merge branch 'refs/heads/ninja-internal' into ColorGradientFix
Diffstat (limited to 'js/controllers')
-rw-r--r--js/controllers/objects-controller.js6
-rw-r--r--js/controllers/presets-controller.js20
-rwxr-xr-xjs/controllers/styles-controller.js9
3 files changed, 29 insertions, 6 deletions
diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 6557c14e..6ca869ba 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -27,7 +27,7 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
27 setTimeout(function() { 27 setTimeout(function() {
28 this.bindToModelObjects(); 28 this.bindToModelObjects();
29 }.bind(this), 1000); 29 }.bind(this), 1000);
30 30 this.currentObjectBindings = [];
31 this._currentDocument = doc; 31 this._currentDocument = doc;
32 }, 32 },
33 enumerable : false 33 enumerable : false
@@ -150,9 +150,9 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
150 var properties = []; 150 var properties = [];
151 151
152 for(var key in object) { 152 for(var key in object) {
153 if(object.hasOwnProperty(key)) { 153 //if(object.hasOwnProperty(key)) {
154 properties.push(key); 154 properties.push(key);
155 } 155 //}
156 } 156 }
157 157
158 if(excludeUnderscoreProperties) { 158 if(excludeUnderscoreProperties) {
diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js
index 4c177189..65a56a74 100644
--- a/js/controllers/presets-controller.js
+++ b/js/controllers/presets-controller.js
@@ -53,6 +53,8 @@ exports.PresetsController = Montage.create(Component, {
53 //// TODO: replace this hack when webkit supports transitionStart event (see above) 53 //// TODO: replace this hack when webkit supports transitionStart event (see above)
54 window.clearTimeout(el.njTimeout); 54 window.clearTimeout(el.njTimeout);
55 55
56 this._dispatchChange();
57
56 el.classList.remove(this.transitionClass); 58 el.classList.remove(this.transitionClass);
57 el.removeEventListener("webkitTransitionEnd", this, true); 59 el.removeEventListener("webkitTransitionEnd", this, true);
58 } 60 }
@@ -107,6 +109,10 @@ exports.PresetsController = Montage.create(Component, {
107 } 109 }
108 }, this); 110 }, this);
109 111
112 if(!useTransition) {
113 this._dispatchChange();
114 }
115
110 } 116 }
111 }, 117 },
112 118
@@ -126,5 +132,19 @@ exports.PresetsController = Montage.create(Component, {
126 132
127 return keysString; 133 return keysString;
128 } 134 }
135 },
136
137 _dispatchChange : {
138 value: function(property, value) {
139 this.application.ninja.stage.updatedStage = true;
140 NJevent('elementChange', {
141 type : 'presetChange',
142 data: {
143 "prop": property,
144 "value": value
145 },
146 redraw: null
147 });
148 }
129 } 149 }
130}); \ No newline at end of file 150}); \ No newline at end of file
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index e7f95335..478fc1db 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -213,6 +213,9 @@ var stylesController = exports.StylesController = Montage.create(Component, {
213 213
214 stylesheet.insertRule(ruleText, index); 214 stylesheet.insertRule(ruleText, index);
215 215
216 ///// Invalidate cache because rule dominance is affected
217 this._clearCache();
218
216 this.styleSheetModified(stylesheet); 219 this.styleSheetModified(stylesheet);
217 220
218 rule = stylesheet.rules[index]; 221 rule = stylesheet.rules[index];
@@ -775,7 +778,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
775 var a = this._getMostSpecificSelectorForElement(element, rule1[this.CONST.SPECIFICITY_KEY]), 778 var a = this._getMostSpecificSelectorForElement(element, rule1[this.CONST.SPECIFICITY_KEY]),
776 b = this._getMostSpecificSelectorForElement(element, rule2[this.CONST.SPECIFICITY_KEY]), 779 b = this._getMostSpecificSelectorForElement(element, rule2[this.CONST.SPECIFICITY_KEY]),
777 win = element.ownerDocument.defaultView, 780 win = element.ownerDocument.defaultView,
778 order; 781 order, sheetAIndex, sheetBIndex, ruleAIndex, ruleBIndex;
779 782
780 order = this.compareSpecificity(a.specificity, b.specificity); 783 order = this.compareSpecificity(a.specificity, b.specificity);
781 784
@@ -786,9 +789,9 @@ var stylesController = exports.StylesController = Montage.create(Component, {
786 /// If tied again (same sheet), determine which is further down in the sheet 789 /// If tied again (same sheet), determine which is further down in the sheet
787 if(sheetAIndex === sheetBIndex) { 790 if(sheetAIndex === sheetBIndex) {
788 ruleAIndex = this.getRuleIndex(rule1); ruleBIndex = this.getRuleIndex(rule2); 791 ruleAIndex = this.getRuleIndex(rule1); ruleBIndex = this.getRuleIndex(rule2);
789 return ruleAIndex < ruleBIndex ? 1 : (ruleAIndex > ruleBIndex) ? -1 : 0; 792 return ruleAIndex < ruleBIndex ? false : (ruleAIndex > ruleBIndex) ? true : false;
790 } else { 793 } else {
791 return sheetAIndex < sheetBIndex ? 1 : (sheetAIndex > sheetBIndex) ? -1 : 0; 794 return sheetAIndex < sheetBIndex ? false : (sheetAIndex > sheetBIndex) ? true : false;
792 } 795 }
793 } 796 }
794 797