aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-21 15:46:26 -0700
committerArmen Kesablyan2012-06-21 15:46:26 -0700
commit4565558afff6fb07db3b5165042e028f467ac41b (patch)
treef1f0b76d4906c0f88afc1dabf3b807ef97039046 /js
parentd9f9a65226dfe26500e82061cc38a7dda302f720 (diff)
downloadninja-4565558afff6fb07db3b5165042e028f467ac41b.tar.gz
Binding View :Requested Changes for Pull Request
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js')
-rw-r--r--js/controllers/objects-controller.js6
-rwxr-xr-xjs/data/tools-data.js2
-rwxr-xr-xjs/document/templates/html/index.html5
-rwxr-xr-xjs/document/views/design.js3
-rw-r--r--js/panels/objects/objects-panel.reel/objects-panel.js15
-rwxr-xr-xjs/stage/binding-view.reel/non-visual-component.reel/non-visual-component.css5
-rwxr-xr-xjs/stage/binding-view.reel/non-visual-component.reel/non-visual-component.html27
-rwxr-xr-xjs/stage/binding-view.reel/non-visual-component.reel/non-visual-component.js18
8 files changed, 3 insertions, 78 deletions
diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 54ff14ba..3e35ef5f 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -47,12 +47,6 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
47 Object.deleteBinding(this, 'objects'); 47 Object.deleteBinding(this, 'objects');
48 this._isBoundToModelObjects = true; 48 this._isBoundToModelObjects = true;
49 } 49 }
50
51// Object.defineBinding(this, 'objects', {
52// boundObject: this.currentDocument.model,
53// boundObjectPropertyPath: 'mObjects',
54// oneway: false
55// });
56 } 50 }
57 }, 51 },
58 52
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index fb195bd3..8ed6433e 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -47,7 +47,7 @@ exports.ToolsData = Montage.create(Montage, {
47 value: 12 47 value: 12
48 }, 48 },
49 bindingToolIndex: { 49 bindingToolIndex: {
50 value: 12 50 value: 13
51 }, 51 },
52 52
53 // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above. 53 // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above.
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index bee2e557..8fc0d82f 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -113,10 +113,7 @@
113 <script type="text/montage-serialization" data-ninja-template="true"> 113 <script type="text/montage-serialization" data-ninja-template="true">
114 { 114 {
115 "owner": { 115 "owner": {
116 "prototype": "main", 116 "prototype": "main"
117 "properties": {
118 "identifier": "testOwner"
119 }
120 } 117 }
121 } 118 }
122 </script> 119 </script>
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 6a6f565d..4a75a1b4 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -454,8 +454,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
454 initMontage: { 454 initMontage: {
455 value: function (scripttags) { 455 value: function (scripttags) {
456 var self = this; 456 var self = this;
457 // 457
458 //debugger;
459 this.iframe.contentWindow.document.body.addEventListener('mjsTemplateReady', function () { 458 this.iframe.contentWindow.document.body.addEventListener('mjsTemplateReady', function () {
460 //Initializing template with user's seriliazation 459 //Initializing template with user's seriliazation
461 var template = this.iframe.contentWindow.mjsTemplate.create(); 460 var template = this.iframe.contentWindow.mjsTemplate.create();
diff --git a/js/panels/objects/objects-panel.reel/objects-panel.js b/js/panels/objects/objects-panel.reel/objects-panel.js
index a1c381a2..727a09aa 100644
--- a/js/panels/objects/objects-panel.reel/objects-panel.js
+++ b/js/panels/objects/objects-panel.reel/objects-panel.js
@@ -23,13 +23,6 @@ exports.ObjectsPanel = Montage.create(Component, {
23 } 23 }
24 }, 24 },
25 25
26
27 templateDidLoad: {
28 value: function() {
29 console.log('objects panel loaded');
30 }
31 },
32
33 prepareForDraw : { 26 prepareForDraw : {
34 value: function() { 27 value: function() {
35 28
@@ -40,14 +33,6 @@ exports.ObjectsPanel = Montage.create(Component, {
40 }); 33 });
41 34
42 } 35 }
43 },
44 draw : {
45 value: function() {
46 console.log("objects panel draw");
47 if(this.objects) {
48
49 }
50 }
51 } 36 }
52 37
53}); \ No newline at end of file 38}); \ No newline at end of file
diff --git a/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.css b/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.css
deleted file mode 100755
index 018448f1..00000000
--- a/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.css
+++ /dev/null
@@ -1,5 +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> */
diff --git a/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.html b/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.html
deleted file mode 100755
index 10abb38d..00000000
--- a/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.html
+++ /dev/null
@@ -1,27 +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 <link rel="stylesheet" type="text/css" href="non-visual-component.css">
11
12 <script type="text/montage-serialization">
13 {
14 "owner": {
15 "prototype": "js/stage/binding-view.reel/non-visual-component.reel",
16 "properties": {
17 "element": {"#": "nonVisualComponent"}
18 }
19 }
20 }
21 </script>
22
23</head>
24<body>
25 <div data-montage-id="nonVisualComponent" class="nonVisualComponent">Label for options</div>
26</body>
27</html>
diff --git a/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.js b/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.js
deleted file mode 100755
index 2ff2e2f7..00000000
--- a/js/stage/binding-view.reel/non-visual-component.reel/non-visual-component.js
+++ /dev/null
@@ -1,18 +0,0 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No 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> */
6
7/**
8@requires montage/core/core
9@requires montage/ui/component
10*/
11var Montage = require("montage/core/core").Montage,
12 Component = require("montage/ui/component").Component;
13
14exports.NonVisualComponent = Montage.create(Component, {
15 title: {
16 value: "value"
17 }
18}); \ No newline at end of file