Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id

Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
author: Valerio Virgillito 2012-05-03 23:08:31 -0700
committer: Valerio Virgillito 2012-05-03 23:08:31 -0700
commit: 3542dab96689a54f97fff6fc654838c07c724517 (patch)
tree: 1c8a8a53985bb72a34ad302e402ffe24aec2f242 /js
parent: 24b483db367291b72170f969de78efcb1a9b95bd (diff)
parent: 60388a7d01d9e34b5cd15bd5cb190a610e4f9a0e (diff)
download: ninja-3542dab96689a54f97fff6fc654838c07c724517.tar.gz
20 files changed, 262 insertions, 373 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html
index bbac6724..edc2d47f 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -37,11 +37,11 @@
    <body>
        <div data-montage-id="tagProperties" class="subToolHolderPanel">
            <div id="tagToolContainer" class="tagRadioButtons">
-                <input type="radio" data-montage-id="divTool" id="divTool" class="tag-type" title="Div Element" name="TagRadios" checked/>
+                <input type="radio" id="divTool" data-montage-id="divTool" class="tag-type" title="Div Element" name="TagRadios" value="div" checked/>
-                <input type="radio" data-montage-id="imageTool" id="imageTool" class="tag-type" title="Image Element" name="TagRadios"/>
+                <input type="radio" id="imageTool"  data-montage-id="imageTool" class="tag-type" title="Image Element" value="image" name="TagRadios"/>
-                <input type="radio" data-montage-id="videoTool" id="videoTool" class="tag-type" title="Video Element" name="TagRadios"/>
+                <input type="radio" id="videoTool"  data-montage-id="videoTool" class="tag-type" title="Video Element" value="video" name="TagRadios"/>
-                <input type="radio" data-montage-id="canvasTool" id="canvasTool" class="tag-type" title="Canvas Element" name="TagRadios"/>
+                <input type="radio" id="canvasTool" data-montage-id="canvasTool" class="tag-type" title="Canvas Element" value="canvas" name="TagRadios"/>
-                <input type="radio" data-montage-id="customTool" id="customTool" class="tag-type" title="Custom Element" name="TagRadios"/>
+                <input type="radio" id="customTool" data-montage-id="customTool" class="tag-type" title="Custom Element" value="custom" name="TagRadios"/>
                <div class="nj-divider divider-vertical">&nbsp;</div>
@@ -67,10 +67,10 @@
                    <label class="label"> Position:</label>
                    <select data-montage-id="positionCB" class="nj-skinned">
+                        <option>Static</option>
                        <option>Absolute</option>
                        <option>Relative</option>
                        <option>Fixed</option>
-                        <option>Static</option>
                        <option>Inherit</option>
                    </select>
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js
index 1caabc35..6519d5b8 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.js
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js
@@ -33,9 +33,9 @@ exports.TagProperties = Montage.create(ToolProperties, {
    handleClick: {
        value: function(event) {
-            this.selectedElement = event._event.target.id;
+            this.selectedElement = event._event.target.value;
-            if(this.selectedElement === "customTool") {
+            if(this.selectedElement === "custom") {
                this.customName.style["display"] = "";
                this.customLabel.style["display"] = "";
            } else {
@@ -46,7 +46,7 @@ exports.TagProperties = Montage.create(ToolProperties, {
    },
    _selectedElement: {
-        value: "divTool", enumerable: false
+        value: "div", enumerable: false
    },
    selectedElement: {
diff --git a/js/controllers/elements/controller-factory.js b/js/controllers/elements/controller-factory.js
index 1bbbbce0..3ac3fe14 100755
--- a/js/controllers/elements/controller-factory.js
+++ b/js/controllers/elements/controller-factory.js
@@ -42,6 +42,8 @@ exports.ControllerFactory = Montage.create(Montage, {
                    return ImageController;
                } else if(value.indexOf("video") !== -1) {
                    return VideoController;
+                } else {
+                    return BlockController;
                }
            } catch (err) {
                console.log("Could not create Controller Factory " + err);
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index ea5fe4af..45d78b33 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -15,16 +15,15 @@ exports.ElementController = Montage.create(Component, {
                var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID);
                if(selectedLayerIndex === 0) {
-                    this.application.ninja.currentDocument.documentRoot.appendChild(el);
+                    this.application.ninja.currentDocument.currentSelectedContainer.appendChild(el);
                } else {
                    var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0];
                    element.parentNode.insertBefore(el, element.nextSibling);
                }
            } else {
-                this.application.ninja.currentDocument.documentRoot.appendChild(el);
+                this.application.ninja.currentDocument.currentSelectedContainer.appendChild(el);
            }
-            // Nested elements - TODO make sure the CSS is correct before nesting elements
-            // this.application.ninja.currentSelectedContainer.appendChild(el);
            if(styles) {
                this.application.ninja.stylesController.setElementStyles(el, styles);
            }
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 8d7b74f0..e9a5f865 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -129,7 +129,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                    el.elementModel.shapeModel.GLWorld.render();
                    break;
                case "useWebGl":
-                    canvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", el.className, true);
+                    canvas = njModule.NJUtils.make("canvas", el.className, this.application.ninja.currentDocument);
                    canvas.setAttribute("data-RDGE-id", njModule.NJUtils.generateRandom());
                    canvas.width = el.width;
                    canvas.height = el.height;
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 65161b4f..d1dc9f34 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -100,7 +100,7 @@ exports.PiData = Montage.create( Montage, {
            }
        ]
    },
-    imagePi: {
+    imgPi: {
        value: [
            {
                label: "Image Properties",
@@ -807,8 +807,8 @@ exports.PiData = Montage.create( Montage, {
                    ]
                ]
            }
-        ] //value: [
+        ]
-    } //BrushStrokePi: {
+    }
 });
diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index dae128e4..5aaeb5f2 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -5,16 +5,15 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component,
    Uuid = require("montage/core/uuid").Uuid,
    ElementModel        = require("js/models/element-model").ElementModel,
    Properties3D    = require("js/models/properties-3d").Properties3D,
    ShapeModel    = require("js/models/shape-model").ShapeModel,
    ControllerFactory   = require("js/controllers/elements/controller-factory").ControllerFactory;
-exports.NJUtils = Object.create(Object.prototype, {
+exports.NJUtils = Montage.create(Component, {
-    
-    
-    
    /* =============== DOM Access ================ */
author	Valerio Virgillito	2012-05-03 23:08:31 -0700
committer	Valerio Virgillito	2012-05-03 23:08:31 -0700
commit	3542dab96689a54f97fff6fc654838c07c724517 (patch)
tree	1c8a8a53985bb72a34ad302e402ffe24aec2f242 /js
parent	24b483db367291b72170f969de78efcb1a9b95bd (diff)
parent	60388a7d01d9e34b5cd15bd5cb190a610e4f9a0e (diff)
download	ninja-3542dab96689a54f97fff6fc654838c07c724517.tar.gz

diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html index bbac6724..edc2d47f 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -1,4 +1,4 @@
1	<!DOCTYPE HTML>	1	<!DOCTYPE HTML>
2	<!-- <copyright>	2	<!-- <copyright>
3	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>	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/>	4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -37,11 +37,11 @@
37	<body>	37	<body>
38	<div data-montage-id="tagProperties" class="subToolHolderPanel">	38	<div data-montage-id="tagProperties" class="subToolHolderPanel">
39	<div id="tagToolContainer" class="tagRadioButtons">	39	<div id="tagToolContainer" class="tagRadioButtons">
40	<input type="radio" data-montage-id="divTool" id="divTool" class="tag-type" title="Div Element" name="TagRadios" checked/>	40	<input type="radio" id="divTool" data-montage-id="divTool" class="tag-type" title="Div Element" name="TagRadios" value="div" checked/>
41	<input type="radio" data-montage-id="imageTool" id="imageTool" class="tag-type" title="Image Element" name="TagRadios"/>	41	<input type="radio" id="imageTool" data-montage-id="imageTool" class="tag-type" title="Image Element" value="image" name="TagRadios"/>
42	<input type="radio" data-montage-id="videoTool" id="videoTool" class="tag-type" title="Video Element" name="TagRadios"/>	42	<input type="radio" id="videoTool" data-montage-id="videoTool" class="tag-type" title="Video Element" value="video" name="TagRadios"/>
43	<input type="radio" data-montage-id="canvasTool" id="canvasTool" class="tag-type" title="Canvas Element" name="TagRadios"/>	43	<input type="radio" id="canvasTool" data-montage-id="canvasTool" class="tag-type" title="Canvas Element" value="canvas" name="TagRadios"/>
44	<input type="radio" data-montage-id="customTool" id="customTool" class="tag-type" title="Custom Element" name="TagRadios"/>	44	<input type="radio" id="customTool" data-montage-id="customTool" class="tag-type" title="Custom Element" value="custom" name="TagRadios"/>
45		45
46	<div class="nj-divider divider-vertical"> </div>	46	<div class="nj-divider divider-vertical"> </div>
47		47
@@ -67,10 +67,10 @@
67	<label class="label"> Position:</label>	67	<label class="label"> Position:</label>
68		68
69	<select data-montage-id="positionCB" class="nj-skinned">	69	<select data-montage-id="positionCB" class="nj-skinned">
		70	<option>Static</option>
70	<option>Absolute</option>	71	<option>Absolute</option>
71	<option>Relative</option>	72	<option>Relative</option>
72	<option>Fixed</option>	73	<option>Fixed</option>
73	<option>Static</option>
74	<option>Inherit</option>	74	<option>Inherit</option>
75	</select>	75	</select>
76		76


diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js index 1caabc35..6519d5b8 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.js +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js
@@ -33,9 +33,9 @@ exports.TagProperties = Montage.create(ToolProperties, {
33		33
34	handleClick: {	34	handleClick: {
35	value: function(event) {	35	value: function(event) {
36	this.selectedElement = event._event.target.id;	36	this.selectedElement = event._event.target.value;
37		37
38	if(this.selectedElement === "customTool") {	38	if(this.selectedElement === "custom") {
39	this.customName.style["display"] = "";	39	this.customName.style["display"] = "";
40	this.customLabel.style["display"] = "";	40	this.customLabel.style["display"] = "";
41	} else {	41	} else {
@@ -46,7 +46,7 @@ exports.TagProperties = Montage.create(ToolProperties, {
46	},	46	},
47		47
48	_selectedElement: {	48	_selectedElement: {
49	value: "divTool", enumerable: false	49	value: "div", enumerable: false
50	},	50	},
51		51
52	selectedElement: {	52	selectedElement: {


diff --git a/js/controllers/elements/controller-factory.js b/js/controllers/elements/controller-factory.js index 1bbbbce0..3ac3fe14 100755 --- a/js/controllers/elements/controller-factory.js +++ b/js/controllers/elements/controller-factory.js
@@ -42,6 +42,8 @@ exports.ControllerFactory = Montage.create(Montage, {
42	return ImageController;	42	return ImageController;
43	} else if(value.indexOf("video") !== -1) {	43	} else if(value.indexOf("video") !== -1) {
44	return VideoController;	44	return VideoController;
		45	} else {
		46	return BlockController;
45	}	47	}
46	} catch (err) {	48	} catch (err) {
47	console.log("Could not create Controller Factory " + err);	49	console.log("Could not create Controller Factory " + err);


diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index ea5fe4af..45d78b33 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js
@@ -15,16 +15,15 @@ exports.ElementController = Montage.create(Component, {
15	var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID);	15	var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID);
16		16
17	if(selectedLayerIndex === 0) {	17	if(selectedLayerIndex === 0) {
18	this.application.ninja.currentDocument.documentRoot.appendChild(el);	18	this.application.ninja.currentDocument.currentSelectedContainer.appendChild(el);
19	} else {	19	} else {
20	var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0];	20	var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0];
21	element.parentNode.insertBefore(el, element.nextSibling);	21	element.parentNode.insertBefore(el, element.nextSibling);
22	}	22	}
23	} else {	23	} else {
24	this.application.ninja.currentDocument.documentRoot.appendChild(el);	24	this.application.ninja.currentDocument.currentSelectedContainer.appendChild(el);
25	}	25	}
26	// Nested elements - TODO make sure the CSS is correct before nesting elements	26
27	// this.application.ninja.currentSelectedContainer.appendChild(el);
28	if(styles) {	27	if(styles) {
29	this.application.ninja.stylesController.setElementStyles(el, styles);	28	this.application.ninja.stylesController.setElementStyles(el, styles);
30	}	29	}


diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index 8d7b74f0..e9a5f865 100755 --- a/js/controllers/elements/shapes-controller.js +++ b/js/controllers/elements/shapes-controller.js
@@ -129,7 +129,7 @@ exports.ShapesController = Montage.create(CanvasController, {
129	el.elementModel.shapeModel.GLWorld.render();	129	el.elementModel.shapeModel.GLWorld.render();
130	break;	130	break;
131	case "useWebGl":	131	case "useWebGl":
132	canvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", el.className, true);	132	canvas = njModule.NJUtils.make("canvas", el.className, this.application.ninja.currentDocument);
133	canvas.setAttribute("data-RDGE-id", njModule.NJUtils.generateRandom());	133	canvas.setAttribute("data-RDGE-id", njModule.NJUtils.generateRandom());
134	canvas.width = el.width;	134	canvas.width = el.width;
135	canvas.height = el.height;	135	canvas.height = el.height;


diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 65161b4f..d1dc9f34 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js
@@ -100,7 +100,7 @@ exports.PiData = Montage.create( Montage, {
100	}	100	}
101	]	101	]
102	},	102	},
103	imagePi: {	103	imgPi: {
104	value: [	104	value: [
105	{	105	{
106	label: "Image Properties",	106	label: "Image Properties",
@@ -807,8 +807,8 @@ exports.PiData = Montage.create( Montage, {
807	]	807	]
808	]	808	]
809	}	809	}
810	] //value: [	810	]
811	} //BrushStrokePi: {	811	}
812	});	812	});
813		813
814		814


diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js index dae128e4..5aaeb5f2 100755 --- a/js/lib/NJUtils.js +++ b/js/lib/NJUtils.js
@@ -5,16 +5,15 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
5	</copyright> */	5	</copyright> */
6		6
7	var Montage = require("montage/core/core").Montage,	7	var Montage = require("montage/core/core").Montage,
		8	Component = require("montage/ui/component").Component,
8	Uuid = require("montage/core/uuid").Uuid,	9	Uuid = require("montage/core/uuid").Uuid,
9	ElementModel = require("js/models/element-model").ElementModel,	10	ElementModel = require("js/models/element-model").ElementModel,
10	Properties3D = require("js/models/properties-3d").Properties3D,	11	Properties3D = require("js/models/properties-3d").Properties3D,
11	ShapeModel = require("js/models/shape-model").ShapeModel,	12	ShapeModel = require("js/models/shape-model").ShapeModel,
12	ControllerFactory = require("js/controllers/elements/controller-factory").ControllerFactory;	13	ControllerFactory = require("js/controllers/elements/controller-factory").ControllerFactory;
13		14
14	exports.NJUtils = Object.create(Object.prototype, {	15	exports.NJUtils = Montage.create(Component, {
15		16
16
17
18	/* =============== DOM Access ================ */	17	/* =============== DOM Access ================ */
19		18