Merge branch 'refs/heads/master' into components

author: Valerio Virgillito 2012-02-15 17:04:39 -0800
committer: Valerio Virgillito 2012-02-15 17:04:39 -0800
commit: fe71cb9aa1700199c0089166ad54fc56eb760644 (patch)
tree: b0c7c24b1f45a079e1c09312ca716e3d35aecad4 /js/stage
parent: 747616980cad14f0b65fbcc7f497ed9680a39d29 (diff)
parent: d366c0bd1af6471511217ed574083e15059519b5 (diff)
download: ninja-fe71cb9aa1700199c0089166ad54fc56eb760644.tar.gz
9 files changed, 356 insertions, 24 deletions
diff --git a/js/stage/layout.js b/js/stage/layout.js
index 1a491210..1a491210 100644..100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js
index 7c6d58b4..d46e2b81 100644..100755
--- a/js/stage/stage-deps.js
+++ b/js/stage/stage-deps.js
@@ -4,18 +4,15 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
-var Montage = require("montage/core/core").Montage,
+var Montage =                   require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
+    Component =                 require("montage/ui/component").Component,
+    snapManager =               require("js/helper-classes/3D/snap-manager").SnapManager,
-var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
+    viewUtils =                 require("js/helper-classes/3D/view-utils").ViewUtils,
-var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
+    drawUtils =                 require("js/helper-classes/3D/draw-utils").DrawUtils,
-var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils;
+    ElementPlanes =     require("js/helper-classes/3D/element-planes").ElementPlanes,
-var ElementPlanes = require("js/helper-classes/3D/element-planes").ElementPlanes;
+    MathUtilsClass =    require("js/helper-classes/3D/math-utils").MathUtilsClass,
-var MathUtilsClass = require("js/helper-classes/3D/math-utils").MathUtilsClass;
+    VecUtils =                  require("js/helper-classes/3D/vec-utils").VecUtils,
-var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
+    DrawingToolBase =   require("js/tools/drawing-tool-base").DrawingToolBase;
-//TODO : This dependency needs to be reworked
-var DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase;
 exports.StageDeps = Montage.create(Component, {
    viewUtils: {
diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css
new file mode 100755
index 00000000..ce7072c7
--- /dev/null
+++ b/js/stage/stage-view.reel/stage-view.css
@@ -0,0 +1,37 @@
+/* <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/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+.codeViewContainer {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #ffffff;
+  width: 100%;
+  height: 100%;
+  overflow:auto;
+  /*display: none;*/
+}
+/* OLD CSS for reference
+#mainContent #codeMirror_1 {
+    height:100%;
+}
+*/
+.CodeMirror {
+    width: 100%;
+    height: 100%;
+    background: white;
+}
+.CodeMirror .CodeMirror-scroll {
+    height: 100%;
+    overflow: scroll;
+    overflow-x: auto;
+    overflow-y: auto;
+}
diff --git a/js/stage/stage-view.reel/stage-view.html b/js/stage/stage-view.reel/stage-view.html
new file mode 100755
index 00000000..ee8fa315
--- /dev/null
+++ b/js/stage/stage-view.reel/stage-view.html
@@ -0,0 +1,31 @@
+<!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/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <link rel="stylesheet" type="text/css" href="stage-view.css">
+    <script type="text/montage-serialization">
+        {
+            "owner": {
+                "module": "js/stage/stage-view.reel",
+                "name": "StageView",
+                "properties": {
+                    "element": {"#": "codeViewContainer"}
+                }
+            }
+        }
+    </script>
+</head>
+<body>
+    <section id="codeViewContainer" class="codeViewContainer"></section>
+</body>
+</html>
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
new file mode 100755
index 00000000..31ace49c
--- /dev/null
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -0,0 +1,247 @@
+/* <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/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+/**
+@requires montage/core/core
+@requires montage/ui/component
+*/
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component;
+exports.StageView = Montage.create(Component, {
+    _documents: {
+        value : []
+    },
+    docs: {
+        get: function() {
+            return this._documents;
+        },
+        set: function(value) {
+            //console.log(value);
+        }
+    },
+    templateDidLoad: {
+        value: function() {
+            this.eventManager.addEventListener("appLoaded", this, false);
+        }
+    },
+    didDraw:{
+        value: function() {
+            if(!this.application.ninja.documentController._textHolder) this.application.ninja.documentController._textHolder = this.element;
+        }
+    },
+    handleAppLoaded: {
+        value: function() {
+            // Don't bind for now
+            /*
+            Object.defineBinding(this, "docs", {
+              boundObject: this.application.ninja.documentController,
+              boundObjectPropertyPath: "_documents"
+            });
+            */
+        }
+    },
+    /**
+     * Creates a text area which will contain the content of the opened text document.
+     */
+    createTextAreaElement: {
+        value: function(uuid) {
+            var codeMirrorDiv = document.createElement("div");
+            codeMirrorDiv.id = "codeMirror_"  + uuid;
+            codeMirrorDiv.style.display = "block";
+            this.element.appendChild(codeMirrorDiv);
+            var textArea = document.createElement("textarea");
+            textArea.id = "code";
+            textArea.name = "code";
+            codeMirrorDiv.appendChild(textArea);
+            return textArea;
+        }
+    },
+    // Temporary function to create a Codemirror text view
+    createTextView: {
+        value: function(doc) {
+            this.application.ninja.documentController._hideCurrentDocument();
+            this.hideOtherDocuments(doc.uuid);
+            var type;
+            switch(doc.documentType) {
+                case  "css" :
+                    type = "css";
+                    break;
+                case "js" :
+                    type = "javascript";
+                    break;
+            }
+            //fix hack
+            document.getElementById("codeMirror_"+doc.uuid).style.display="block";
+            var documentController = this.application.ninja.documentController;
+            doc.editor = CodeMirror.fromTextArea(doc.textArea, {
+                lineNumbers: true,
+                       mode: type,
+                       onChange: function(){
+                           var historySize = doc.editor.historySize();
+                           if(historySize.undo>0){
+                                doc.dirtyFlag=true;
+                           }else if(historySize.undo===0 && historySize.redo>0){
+                               doc.dirtyFlag=false;
+                           }
+                       },
+                       onCursorActivity: function() {
+                           //documentController._codeEditor.editor.setLineClass(documentController._codeEditor.hline, null);
+                           //documentController._codeEditor.hline = documentController._codeEditor.editor.setLineClass(documentController._codeEditor.editor.getCursor().line, "activeline");
+                       }
+           });
+           //this.application.ninja.documentController._cod
author	Valerio Virgillito	2012-02-15 17:04:39 -0800
committer	Valerio Virgillito	2012-02-15 17:04:39 -0800
commit	fe71cb9aa1700199c0089166ad54fc56eb760644 (patch)
tree	b0c7c24b1f45a079e1c09312ca716e3d35aecad4 /js/stage
parent	747616980cad14f0b65fbcc7f497ed9680a39d29 (diff)
parent	d366c0bd1af6471511217ed574083e15059519b5 (diff)
download	ninja-fe71cb9aa1700199c0089166ad54fc56eb760644.tar.gz

diff --git a/js/stage/layout.js b/js/stage/layout.js index 1a491210..1a491210 100644..100755 --- a/js/stage/layout.js +++ b/js/stage/layout.js


diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index 7c6d58b4..d46e2b81 100644..100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js
@@ -4,18 +4,15 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
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	Component = require("montage/ui/component").Component,
9		9	snapManager = require("js/helper-classes/3D/snap-manager").SnapManager,
10	var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;	10	viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
11	var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;	11	drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
12	var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils;	12	ElementPlanes = require("js/helper-classes/3D/element-planes").ElementPlanes,
13	var ElementPlanes = require("js/helper-classes/3D/element-planes").ElementPlanes;	13	MathUtilsClass = require("js/helper-classes/3D/math-utils").MathUtilsClass,
14	var MathUtilsClass = require("js/helper-classes/3D/math-utils").MathUtilsClass;	14	VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
15	var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;	15	DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase;
16
17	//TODO : This dependency needs to be reworked
18	var DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase;
19		16
20	exports.StageDeps = Montage.create(Component, {	17	exports.StageDeps = Montage.create(Component, {
21	viewUtils: {	18	viewUtils: {


diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css new file mode 100755 index 00000000..ce7072c7 --- /dev/null +++ b/js/stage/stage-view.reel/stage-view.css
@@ -0,0 +1,37 @@
		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> */
		6
		7	.codeViewContainer {
		8	position: absolute;
		9	top: 0px;
		10	left: 0px;
		11	margin: 0px;
		12	padding: 0px;
		13	background-color: #ffffff;
		14	width: 100%;
		15	height: 100%;
		16	overflow:auto;
		17	/display: none;/
		18	}
		19
		20	/* OLD CSS for reference
		21	#mainContent #codeMirror_1 {
		22	height:100%;
		23	}
		24	*/
		25
		26	.CodeMirror {
		27	width: 100%;
		28	height: 100%;
		29	background: white;
		30	}
		31
		32	.CodeMirror .CodeMirror-scroll {
		33	height: 100%;
		34	overflow: scroll;
		35	overflow-x: auto;
		36	overflow-y: auto;
		37	}


diff --git a/js/stage/stage-view.reel/stage-view.html b/js/stage/stage-view.reel/stage-view.html new file mode 100755 index 00000000..ee8fa315 --- /dev/null +++ b/js/stage/stage-view.reel/stage-view.html
@@ -0,0 +1,31 @@
		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="stage-view.css">
		11
		12	<script type="text/montage-serialization">
		13	{
		14	"owner": {
		15	"module": "js/stage/stage-view.reel",
		16	"name": "StageView",
		17	"properties": {
		18	"element": {"#": "codeViewContainer"}
		19	}
		20	}
		21	}
		22	</script>
		23
		24	</head>
		25	<body>
		26
		27
		28	<section id="codeViewContainer" class="codeViewContainer"></section>
		29
		30	</body>
		31	</html>


diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js new file mode 100755 index 00000000..31ace49c --- /dev/null +++ b/js/stage/stage-view.reel/stage-view.js
@@ -0,0 +1,247 @@
		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> */
		6
		7	/**
		8	@requires montage/core/core
		9	@requires montage/ui/component
		10	*/
		11	var Montage = require("montage/core/core").Montage,
		12	Component = require("montage/ui/component").Component;
		13
		14	exports.StageView = Montage.create(Component, {
		15	_documents: {
		16	value : []
		17	},
		18
		19	docs: {
		20	get: function() {
		21	return this._documents;
		22	},
		23	set: function(value) {
		24	//console.log(value);
		25	}
		26	},
		27
		28	templateDidLoad: {
		29	value: function() {
		30	this.eventManager.addEventListener("appLoaded", this, false);
		31	}
		32	},
		33
		34	didDraw:{
		35	value: function() {
		36	if(!this.application.ninja.documentController._textHolder) this.application.ninja.documentController._textHolder = this.element;
		37	}
		38	},
		39
		40	handleAppLoaded: {
		41	value: function() {
		42
		43	// Don't bind for now
		44	/*
		45	Object.defineBinding(this, "docs", {
		46	boundObject: this.application.ninja.documentController,
		47	boundObjectPropertyPath: "_documents"
		48	});
		49	*/
		50
		51	}
		52	},
		53
		54	/**
		55	* Creates a text area which will contain the content of the opened text document.
		56	*/
		57	createTextAreaElement: {
		58	value: function(uuid) {
		59
		60
		61	var codeMirrorDiv = document.createElement("div");
		62	codeMirrorDiv.id = "codeMirror_" + uuid;
		63	codeMirrorDiv.style.display = "block";
		64	this.element.appendChild(codeMirrorDiv);
		65
		66	var textArea = document.createElement("textarea");
		67	textArea.id = "code";
		68	textArea.name = "code";
		69
		70	codeMirrorDiv.appendChild(textArea);
		71
		72	return textArea;
		73	}
		74	},
		75
		76	// Temporary function to create a Codemirror text view
		77	createTextView: {
		78	value: function(doc) {
		79	this.application.ninja.documentController._hideCurrentDocument();
		80	this.hideOtherDocuments(doc.uuid);
		81	var type;
		82	switch(doc.documentType) {
		83	case "css" :
		84	type = "css";
		85	break;
		86	case "js" :
		87	type = "javascript";
		88	break;
		89	}
		90
		91	//fix hack
		92	document.getElementById("codeMirror_"+doc.uuid).style.display="block";
		93
		94	var documentController = this.application.ninja.documentController;
		95	doc.editor = CodeMirror.fromTextArea(doc.textArea, {
		96	lineNumbers: true,
		97	mode: type,
		98	onChange: function(){
		99	var historySize = doc.editor.historySize();
		100	if(historySize.undo>0){
		101	doc.dirtyFlag=true;
		102	}else if(historySize.undo===0 && historySize.redo>0){
		103	doc.dirtyFlag=false;
		104	}
		105	},
		106	onCursorActivity: function() {
		107	//documentController._codeEditor.editor.setLineClass(documentController._codeEditor.hline, null);
		108	//documentController._codeEditor.hline = documentController._codeEditor.editor.setLineClass(documentController._codeEditor.editor.getCursor().line, "activeline");
		109	}
		110	});
		111
		112	//this.application.ninja.documentController._cod