diff options
| author | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
| commit | 04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch) | |
| tree | d0041abc7379ef38b20cce148e5dea6f531b8569 /node_modules/montage/ui/photo-editor.reel/photo-editor.html | |
| parent | 4d8306b638c53899403a4f0328c02bf1ab893e8f (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
.gitignore
js/ninja.reel/ninja.js
Diffstat (limited to 'node_modules/montage/ui/photo-editor.reel/photo-editor.html')
| -rwxr-xr-x | node_modules/montage/ui/photo-editor.reel/photo-editor.html | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/node_modules/montage/ui/photo-editor.reel/photo-editor.html b/node_modules/montage/ui/photo-editor.reel/photo-editor.html deleted file mode 100755 index 8a0ac1d2..00000000 --- a/node_modules/montage/ui/photo-editor.reel/photo-editor.html +++ /dev/null | |||
| @@ -1,50 +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 | <html> | ||
| 8 | <head> | ||
| 9 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
| 10 | <title>Photo Editor</title> | ||
| 11 | <link rel="stylesheet" type="text/css" href="photo-editor.css"> | ||
| 12 | |||
| 13 | <script type="text/montage-serialization"> | ||
| 14 | { | ||
| 15 | "image": { | ||
| 16 | "module": "montage/ui/image.reel", | ||
| 17 | "name": "Image", | ||
| 18 | "properties": { | ||
| 19 | "element": {"#": "image"} | ||
| 20 | }, | ||
| 21 | "bindings": { | ||
| 22 | "src": { | ||
| 23 | "boundObject": {"@": "owner"}, | ||
| 24 | "boundObjectPropertyPath": "src", | ||
| 25 | "oneway": true | ||
| 26 | } | ||
| 27 | } | ||
| 28 | }, | ||
| 29 | "owner": { | ||
| 30 | "module": "montage/ui/photo-editor.reel", | ||
| 31 | "name": "PhotoEditor", | ||
| 32 | "properties": { | ||
| 33 | "element": {"#": "editor"}, | ||
| 34 | "_image": {"@": "image"}, | ||
| 35 | "_canvas": {"#": "canvas"} | ||
| 36 | } | ||
| 37 | } | ||
| 38 | } | ||
| 39 | </script> | ||
| 40 | |||
| 41 | </head> | ||
| 42 | <body> | ||
| 43 | |||
| 44 | <div id="editor" class="PhotoEditor"> | ||
| 45 | <img id="image" class="image"> | ||
| 46 | <canvas id="canvas" class="canvas"></canvas> | ||
| 47 | </div> | ||
| 48 | |||
| 49 | </body> | ||
| 50 | </html> | ||