aboutsummaryrefslogtreecommitdiff
path: root/js/document/templates/html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-17 14:01:38 -0700
committerArmen Kesablyan2012-05-17 14:01:38 -0700
commit6c8f3525b839e82cf43df43700a0160ee2c5458f (patch)
tree3fb801fa54b759c5568d75bb467e02652ce77c3e /js/document/templates/html
parente8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff)
parent342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff)
downloadninja-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')
-rwxr-xr-xjs/document/templates/html/index.html7
-rw-r--r--js/document/templates/html/main.js49
-rwxr-xr-xjs/document/templates/html/package.json8
3 files changed, 4 insertions, 60 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 {
diff --git a/js/document/templates/html/main.js b/js/document/templates/html/main.js
deleted file mode 100644
index d5ac88d5..00000000
--- a/js/document/templates/html/main.js
+++ /dev/null
@@ -1,49 +0,0 @@
1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */
6var Montage = require("montage/core/core").Montage,
7 Component = require("montage/ui/component").Component;
8
9exports.Main = Montage.create(Component, {
10
11 hasTemplate: {
12 value: false
13 },
14
15 /**
16 * Adding window hooks to callback into this object from Ninja.
17 */
18 templateDidLoad: {
19 value: function(){
20 var self = this;
21 window.addComponent = function(element, data, callback) {
22 var component;
23
24 component = require.async(data.path)
25 .then(function(component) {
26 var componentRequire = component[data.name];
27 var componentInstance = componentRequire.create();
28
29 componentInstance.element = element;
30
31 componentInstance.needsDraw = true;
32 componentInstance.ownerComponent = self;
33
34 callback(componentInstance, element);
35 })
36 .end();
37
38 };
39
40 // Dispatch event when this template has loaded.
41 /*
42 var newEvent = document.createEvent( "CustomEvent" );
43 newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
44 document.body.dispatchEvent( newEvent );
45 */
46
47 }
48 }
49}); \ No newline at end of file
diff --git a/js/document/templates/html/package.json b/js/document/templates/html/package.json
deleted file mode 100755
index c8bc02fb..00000000
--- a/js/document/templates/html/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
1{
2 "directories": {
3 "lib": ""
4 },
5 "mappings": {
6 "montage": "../../../../node_modules/montage/"
7 }
8} \ No newline at end of file