aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/application.js
diff options
context:
space:
mode:
authorJon Reid2012-03-09 16:47:26 -0800
committerJon Reid2012-03-09 16:47:26 -0800
commitbe59c44f9232104ded1a9c4cd888d70021eba33e (patch)
treeb94c8432759362e035f15c0936c575a2861b6ad8 /node_modules/montage/ui/application.js
parent54b31ecbd4c9877183850542227c61946a62aa4f (diff)
parenta28cb88194f45325e42dd8c774469424712dd6f4 (diff)
downloadninja-be59c44f9232104ded1a9c4cd888d70021eba33e.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local
Diffstat (limited to 'node_modules/montage/ui/application.js')
-rwxr-xr-xnode_modules/montage/ui/application.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/montage/ui/application.js b/node_modules/montage/ui/application.js
index c7b3dc73..7cb4bd97 100755
--- a/node_modules/montage/ui/application.js
+++ b/node_modules/montage/ui/application.js
@@ -175,7 +175,7 @@ var Application = exports.Application = Montage.create(Montage, /** @lends monta
175 _createPopupSlot: {value: function(zIndex) { 175 _createPopupSlot: {value: function(zIndex) {
176 var slotEl = document.createElement('div'); 176 var slotEl = document.createElement('div');
177 document.body.appendChild(slotEl); 177 document.body.appendChild(slotEl);
178 slotEl.style['z-index'] = zIndex; 178 slotEl.style.zIndex = zIndex;
179 slotEl.style.position = 'absolute'; 179 slotEl.style.position = 'absolute';
180 180
181 var popupSlot = Slot.create(); 181 var popupSlot = Slot.create();
@@ -221,7 +221,7 @@ var Application = exports.Application = Montage.create(Montage, /** @lends monta
221 } 221 }
222 // use the new zIndex for custom popup 222 // use the new zIndex for custom popup
223 if(!isSystemPopup) { 223 if(!isSystemPopup) {
224 popupSlot.element.style['z-index'] = zIndex; 224 popupSlot.element.style.zIndex = zIndex;
225 } 225 }
226 226
227 popupSlot.content = content; 227 popupSlot.content = content;