diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /node_modules/montage/ui/popup/notifier.reel | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/popup/notifier.reel')
-rwxr-xr-x | node_modules/montage/ui/popup/notifier.reel/notifier.html | 2 | ||||
-rwxr-xr-x | node_modules/montage/ui/popup/notifier.reel/notifier.js | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/node_modules/montage/ui/popup/notifier.reel/notifier.html b/node_modules/montage/ui/popup/notifier.reel/notifier.html index 3dfca6f6..09fe57ac 100755 --- a/node_modules/montage/ui/popup/notifier.reel/notifier.html +++ b/node_modules/montage/ui/popup/notifier.reel/notifier.html | |||
@@ -11,7 +11,7 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "owner": { | 13 | "owner": { |
14 | "prototype": "montage/ui/popup/notifier.reel", | 14 | "prototype": "ui/popup/notifier.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": { | 16 | "element": { |
17 | "#": "notifier-main" | 17 | "#": "notifier-main" |
diff --git a/node_modules/montage/ui/popup/notifier.reel/notifier.js b/node_modules/montage/ui/popup/notifier.reel/notifier.js index ac3dcff9..c0878e65 100755 --- a/node_modules/montage/ui/popup/notifier.reel/notifier.js +++ b/node_modules/montage/ui/popup/notifier.reel/notifier.js | |||
@@ -20,9 +20,11 @@ var Popup = require("ui/popup/popup.reel").Popup; | |||
20 | */ | 20 | */ |
21 | 21 | ||
22 | var Notifier = exports.Notifier = Montage.create(Component, /** @lends module:"montage/ui/popup/notifier.reel".Notifier# */ { | 22 | var Notifier = exports.Notifier = Montage.create(Component, /** @lends module:"montage/ui/popup/notifier.reel".Notifier# */ { |
23 | hasTemplate: {value: true}, | ||
24 | 23 | ||
25 | _msgEl: {value: null}, | 24 | _msgEl: { |
25 | value: null, | ||
26 | serializable: true | ||
27 | }, | ||
26 | /** | 28 | /** |
27 | Description TODO | 29 | Description TODO |
28 | @private | 30 | @private |