diff options
| author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
| commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
| tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /js/document/templates/montage-web/index.html | |
| parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/document/templates/montage-web/index.html')
| -rwxr-xr-x | js/document/templates/montage-web/index.html | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html deleted file mode 100755 index caebc8d0..00000000 --- a/js/document/templates/montage-web/index.html +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | <!DOCTYPE html> | ||
| 2 | <!-- <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 7 | |||
| 8 | <html> | ||
| 9 | |||
| 10 | <head> | ||
| 11 | |||
| 12 | <title>Ninja Prototype</title> | ||
| 13 | |||
| 14 | <link href="default_html.css" id="nj-stage-stylesheet" rel="stylesheet" type="text/css" media="screen"/> | ||
| 15 | |||
| 16 | <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script> | ||
| 17 | |||
| 18 | <script type="text/javascript"> | ||
| 19 | function getElement(x,y) { | ||
| 20 | return document.elementFromPoint(x,y); | ||
| 21 | } | ||
| 22 | </script> | ||
| 23 | |||
| 24 | <script type="text/montage-serialization"> | ||
| 25 | { | ||
| 26 | "owner": { | ||
| 27 | "prototype": "main.reel" | ||
| 28 | } | ||
| 29 | } | ||
| 30 | </script> | ||
| 31 | |||
| 32 | </head> | ||
| 33 | |||
| 34 | <body> | ||
| 35 | <style></style> | ||
| 36 | </body> | ||
| 37 | |||
| 38 | </html> \ No newline at end of file | ||