diff options
| author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
| commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
| tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /js/document/templates/html/index.html | |
| parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
| parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
| download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/document/templates/html/index.html')
| -rwxr-xr-x | js/document/templates/html/index.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html index a1b8b242..933df157 100755 --- a/js/document/templates/html/index.html +++ b/js/document/templates/html/index.html | |||
| @@ -12,6 +12,9 @@ | |||
| 12 | must set the 'data-ninja-template' | 12 | must set the 'data-ninja-template' |
| 13 | data-ninja-template="true" | 13 | data-ninja-template="true" |
| 14 | --> | 14 | --> |
| 15 | |||
| 16 | <!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open --> | ||
| 17 | |||
| 15 | <html> | 18 | <html> |
| 16 | 19 | ||
| 17 | <head> | 20 | <head> |
| @@ -58,10 +61,8 @@ | |||
| 58 | return document.elementFromPoint(x,y); | 61 | return document.elementFromPoint(x,y); |
| 59 | } | 62 | } |
| 60 | </script> | 63 | </script> |
| 61 | |||
| 62 | <!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open --> | ||
| 63 | 64 | ||
| 64 | <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script> | 65 | <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script> |
| 65 | 66 | ||
| 66 | <script type="text/montage-serialization" data-ninja-template="true"> | 67 | <script type="text/montage-serialization" data-ninja-template="true"> |
| 67 | { | 68 | { |