diff options
author | Pushkar Joshi | 2012-03-12 15:26:10 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-12 15:26:10 -0700 |
commit | 46b2e561fa6ca054cad58e4c372a598bbb7ee2c9 (patch) | |
tree | 38d1c8666098a10078834c1eaac3d455135bee12 /node_modules/montage/ui/application.js | |
parent | 7b4b068cadc0af8ec7e930e1c2b429e945f96984 (diff) | |
parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
download | ninja-46b2e561fa6ca054cad58e4c372a598bbb7ee2c9.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'node_modules/montage/ui/application.js')
-rwxr-xr-x | node_modules/montage/ui/application.js | 4 |
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; |