diff options
author | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
commit | 2e04af953463643791f6362bd8ef4c6ba190abfa (patch) | |
tree | d07aaf646091ddf9dad5b030a7905055fd323490 /node_modules/montage/ui/popup/notifier.reel/notifier.js | |
parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
download | ninja-2e04af953463643791f6362bd8ef4c6ba190abfa.tar.gz |
Squashed commit of the following:
commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 18 13:48:21 2012 -0700
Merge branch 'refs/heads/master' into integration
commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:29:41 2012 -0700
updating the picasa carousel
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:03:50 2012 -0700
Merge branch 'refs/heads/master' into integration
commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 11 10:39:36 2012 -0700
integrating new picasa carousel component
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 10 14:33:00 2012 -0700
fixed the text area case issue
Text area was renamed from TextArea to Textarea
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date: Mon Apr 9 22:10:45 2012 -0700
integrating montage v0.8 into ninja.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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(); |