diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /node_modules/montage/ui/popup/notifier.reel/notifier.html | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/popup/notifier.reel/notifier.html')
| -rwxr-xr-x | node_modules/montage/ui/popup/notifier.reel/notifier.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/node_modules/montage/ui/popup/notifier.reel/notifier.html b/node_modules/montage/ui/popup/notifier.reel/notifier.html index 71cd2608..3dfca6f6 100755 --- a/node_modules/montage/ui/popup/notifier.reel/notifier.html +++ b/node_modules/montage/ui/popup/notifier.reel/notifier.html | |||
| @@ -11,8 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| 14 | "module": "montage/ui/popup/notifier.reel", | 14 | "prototype": "montage/ui/popup/notifier.reel", |
| 15 | "name": "Notifier", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | "element": { | 16 | "element": { |
| 18 | "#": "notifier-main" | 17 | "#": "notifier-main" |
| @@ -28,8 +27,8 @@ | |||
| 28 | 27 | ||
| 29 | </head> | 28 | </head> |
| 30 | <body> | 29 | <body> |
| 31 | <div id="notifier-main" class="montage-notifier"> | 30 | <div data-montage-id="notifier-main" class="montage-notifier"> |
| 32 | <div id="notifier-msg" class="montage-notifier-msg"></div> | 31 | <div data-montage-id="notifier-msg" class="montage-notifier-msg"></div> |
| 33 | </div> | 32 | </div> |
| 34 | </body> | 33 | </body> |
| 35 | </html> | 34 | </html> |