diff options
| author | Ananya Sen | 2012-02-03 09:57:41 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-03 09:57:41 -0800 |
| commit | c093dd13a84ce6eb3e00a672c38a808093c5d966 (patch) | |
| tree | 5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /node_modules/montage/ui/progress.reel/progress.html | |
| parent | 79b0173eeca079dec42ff1480182656dbe3af44f (diff) | |
| parent | 8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff) | |
| download | ninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz | |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
js/io/ui/save-as-dialog.reel/save-as-dialog.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/progress.reel/progress.html')
| -rwxr-xr-x | node_modules/montage/ui/progress.reel/progress.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/node_modules/montage/ui/progress.reel/progress.html b/node_modules/montage/ui/progress.reel/progress.html index 7f74edc4..025847e7 100755 --- a/node_modules/montage/ui/progress.reel/progress.html +++ b/node_modules/montage/ui/progress.reel/progress.html | |||
| @@ -11,11 +11,11 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| 14 | "module": "montage/ui/progress.reel", | 14 | "module": "montage/ui/bluemoon/progress.reel", |
| 15 | "name": "Progress", | 15 | "name": "Progress", |
| 16 | "properties": { | 16 | "properties": { |
| 17 | "element": {"#": "progress"}, | 17 | "element": {"#": "progress"}, |
| 18 | "_barEl": {"#": "bar"} | 18 | "_barElement": {"#": "bar"} |
| 19 | } | 19 | } |
| 20 | } | 20 | } |
| 21 | } | 21 | } |
| @@ -23,10 +23,10 @@ | |||
| 23 | 23 | ||
| 24 | </head> | 24 | </head> |
| 25 | <body> | 25 | <body> |
| 26 | 26 | ||
| 27 | <div id="progress" class="montage-progress"> | 27 | <div id="progress" class="montage-progress"> |
| 28 | <div id="bar" class="bar"></div> | 28 | <div id="bar" class="bar"></div> |
| 29 | </div> | 29 | </div> |
| 30 | 30 | ||
| 31 | </body> | 31 | </body> |
| 32 | </html> | 32 | </html> |