diff options
author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/ui/popup/notifier.reel/notifier.js | |
parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/montage/ui/popup/notifier.reel/notifier.js')
-rwxr-xr-x | node_modules/montage/ui/popup/notifier.reel/notifier.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/node_modules/montage/ui/popup/notifier.reel/notifier.js b/node_modules/montage/ui/popup/notifier.reel/notifier.js index 6346cd19..ac3dcff9 100755 --- a/node_modules/montage/ui/popup/notifier.reel/notifier.js +++ b/node_modules/montage/ui/popup/notifier.reel/notifier.js | |||
@@ -78,14 +78,12 @@ var Notifier = exports.Notifier = Montage.create(Component, /** @lends module:"m | |||
78 | popup = Popup.create(); | 78 | popup = Popup.create(); |
79 | this.popup = popup; | 79 | this.popup = popup; |
80 | popup.type = 'notify'; | 80 | popup.type = 'notify'; |
81 | popup.boxed = false; | ||
82 | this.application._notifyPopup = popup; | 81 | this.application._notifyPopup = popup; |
83 | 82 | ||
84 | notifier = Notifier.create(); | 83 | notifier = Notifier.create(); |
85 | popup.content = notifier; | 84 | popup.content = notifier; |
86 | } | 85 | } |
87 | notifier = popup.content; | 86 | notifier = popup.content; |
88 | //popup.modal = !!modal; | ||
89 | notifier.msg = msg; | 87 | notifier.msg = msg; |
90 | 88 | ||
91 | if (!position) { | 89 | if (!position) { |
@@ -100,7 +98,7 @@ var Notifier = exports.Notifier = Montage.create(Component, /** @lends module:"m | |||
100 | 98 | ||
101 | if(timeout) { | 99 | if(timeout) { |
102 | timeout = parseInt(timeout, 10) || 3000; | 100 | timeout = parseInt(timeout, 10) || 3000; |
103 | popup.autoDismiss = timeout; | 101 | popup.autoHide = timeout; |
104 | } | 102 | } |
105 | 103 | ||
106 | popup.show(); | 104 | popup.show(); |