diff options
author | Eric Guzman | 2012-04-23 11:55:55 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-23 11:55:55 -0700 |
commit | cdd1189e349e2974681e2c451e861e5b0db570e4 (patch) | |
tree | d8823c3d050e011032c563d20c1a5f61e67ae740 /node_modules/montage/ui/popup/notifier.reel/notifier.js | |
parent | c0fce534c255ef1e25779e2f0e8de95bb4e160cf (diff) | |
parent | 5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff) | |
download | ninja-cdd1189e349e2974681e2c451e861e5b0db570e4.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
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(); |