aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorEric Guzman2012-05-22 15:57:23 -0700
committerEric Guzman2012-05-22 15:57:23 -0700
commitad3b4595d7377e5bf75bcb8ad81007859b0a8a02 (patch)
treeecb7fe289824a625b1dc422a97c2236826081ec3 /js
parent0eb95ff2dbba1fe7213eed2e0140b4d07bda3dd5 (diff)
parent2b207ef8b2594927f8cd6cd63a8483d205cb86c4 (diff)
downloadninja-ad3b4595d7377e5bf75bcb8ad81007859b0a8a02.tar.gz
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts: js/controllers/styles-controller.js
Diffstat (limited to 'js')
-rw-r--r--js/controllers/code-editor-controller.js40
-rwxr-xr-xjs/controllers/document-controller.js175
-rwxr-xr-xjs/document/document-html.js22
-rwxr-xr-xjs/document/document-text.js52
-rwxr-xr-xjs/document/html-document.js4
-rwxr-xr-xjs/document/models/base.js2
-rwxr-xr-xjs/document/models/html.js5
-rwxr-xr-xjs/document/models/text.js57
-rwxr-xr-xjs/document/views/base.js2
-rwxr-xr-xjs/document/views/code.js152
-rwxr-xr-xjs/document/views/design.js13
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js146
-rwxr-xr-xjs/helper-classes/3D/view-utils.js13
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/lib/geom/circle.js124
-rwxr-xr-xjs/lib/geom/rectangle.js190
-rw-r--r--js/lib/geom/shape-primitive.js27
-rwxr-xr-xjs/lib/rdge/materials/linear-gradient-material.js36
-rwxr-xr-xjs/lib/rdge/materials/material.js4
-rwxr-xr-xjs/lib/rdge/materials/radial-gradient-material.js70
-rw-r--r--js/mediators/io-mediator.js149
-rwxr-xr-xjs/ninja.reel/ninja.js2
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js132
-rwxr-xr-xjs/stage/stage.reel/stage.js71
24 files changed, 907 insertions, 583 deletions
diff --git a/js/controllers/code-editor-controller.js b/js/controllers/code-editor-controller.js
index 7913cfc1..e7163bd8 100644
--- a/js/controllers/code-editor-controller.js
+++ b/js/controllers/code-editor-controller.js
@@ -68,7 +68,7 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
68 * Creates an editor instance 68 * Creates an editor instance
69 */ 69 */
70 createEditor : { 70 createEditor : {
71 value:function(doc, type, documentType){ 71 value:function(codeDocumentView, type, documentType, textDocument){
72 var self = this, editorOptions = null; 72 var self = this, editorOptions = null;
73 73
74 editorOptions = { 74 editorOptions = {
@@ -76,17 +76,17 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
76 matchBrackets:true, 76 matchBrackets:true,
77 mode: type, 77 mode: type,
78 onChange: function(){ 78 onChange: function(){
79 var historySize = doc.editor.historySize(); 79 var historySize = codeDocumentView.editor.historySize();
80 if(historySize.undo>0){ 80 if(historySize.undo>0){
81 doc.needsSave = true; 81 textDocument.model.needsSave = true;
82 }else if(historySize.undo===0 && historySize.redo>0){ 82 }else if(historySize.undo===0 && historySize.redo>0){
83 doc.needsSave = false; 83 textDocument.model.needsSave = false;
84 } 84 }
85 }, 85 },
86 onCursorActivity: function() { 86 onCursorActivity: function() {
87 doc.editor.matchHighlight("CodeMirror-matchhighlight"); 87 codeDocumentView.editor.matchHighlight("CodeMirror-matchhighlight");
88 doc.editor.setLineClass(doc.editor.hline, null, null); 88 codeDocumentView.editor.setLineClass(codeDocumentView.editor.hline, null, null);
89 doc.editor.hline = doc.editor.setLineClass(doc.editor.getCursor().line, null, "activeline"); 89 codeDocumentView.editor.hline = codeDocumentView.editor.setLineClass(codeDocumentView.editor.getCursor().line, null, "activeline");
90 } 90 }
91 }; 91 };
92 92
@@ -95,9 +95,7 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
95 editorOptions.onKeyEvent = function(cm, keyEvent){self._codeCompletionKeyEventHandler.call(self, cm, keyEvent, documentType)}; 95 editorOptions.onKeyEvent = function(cm, keyEvent){self._codeCompletionKeyEventHandler.call(self, cm, keyEvent, documentType)};
96 } 96 }
97 97
98 var editor = self.codeEditor.fromTextArea(doc.textArea, editorOptions); 98 var editor = self.codeEditor.fromTextArea(codeDocumentView.textArea, editorOptions);
99
100 //editor.setOption("theme", "night");
101 99
102 return editor; 100 return editor;
103 } 101 }
@@ -215,22 +213,22 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
215 213
216 autoFormatSelection:{ 214 autoFormatSelection:{
217 value: function(){ 215 value: function(){
218 var range = this.getSelectedRange(this.application.ninja.documentController.activeDocument.editor); 216 var range = this.getSelectedRange(this.application.ninja.documentController.activeDocument.model.views.code.editor);
219 this.application.ninja.documentController.activeDocument.editor.autoFormatRange(range.from, range.to); 217 this.application.ninja.documentController.activeDocument.model.views.code.editor.autoFormatRange(range.from, range.to);
220 } 218 }
221 }, 219 },
222 220
223 commentSelection:{ 221 commentSelection:{
224 value: function(isComment){ 222 value: function(isComment){
225 var range = this.getSelectedRange(this.application.ninja.documentController.activeDocument.editor); 223 var range = this.getSelectedRange(this.application.ninja.documentController.activeDocument.model.views.code.editor);
226 this.application.ninja.documentController.activeDocument.editor.commentRange(isComment, range.from, range.to); 224 this.application.ninja.documentController.activeDocument.model.views.code.editor.commentRange(isComment, range.from, range.to);
227 } 225 }
228 }, 226 },
229 227
230 handleThemeSelection:{ 228 handleThemeSelection:{
231 value: function(){ 229 value: function(){
232 this.application.ninja.documentController.activeDocument.editor.setOption("theme", this.editorTheme); 230 this.application.ninja.documentController.activeDocument.model.views.code.editor.setOption("theme", this.editorTheme);
233 this.application.ninja.stage.stageView.applyTheme("cm-s-"+this.editorTheme); 231 this.application.ninja.documentController.activeDocument.model.views.code.applyTheme("cm-s-"+this.editorTheme);
234 } 232 }
235 }, 233 },
236 234
@@ -238,10 +236,10 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
238 value:function(value){ 236 value:function(value){
239 var originalFont=13,originalLineHeight=16; 237 var originalFont=13,originalLineHeight=16;
240 this._zoomFactor = value; 238 this._zoomFactor = value;
241 this.application.ninja.documentController.activeDocument.container.style.fontSize = ""+((value/100)*originalFont)+"px"; 239 this.application.ninja.documentController.activeDocument.model.views.code.textViewContainer.style.fontSize = ""+((value/100)*originalFont)+"px";
242 this.application.ninja.documentController.activeDocument.container.style.cursor = "text"; 240 this.application.ninja.documentController.activeDocument.model.views.code.textViewContainer.style.cursor = "text";
243 this.application.ninja.documentController.activeDocument.container.querySelector(".CodeMirror").style.lineHeight = ""+((value/100)*originalLineHeight)+"px"; 241 this.application.ninja.documentController.activeDocument.model.views.code.textViewContainer.querySelector(".CodeMirror").style.lineHeight = ""+((value/100)*originalLineHeight)+"px";
244 this.application.ninja.documentController.activeDocument.editor.refresh();//refresh editor display for xoom 242 this.application.ninja.documentController.activeDocument.model.views.code.editor.refresh();//refresh editor display for xoom
245 } 243 }
246 }, 244 },
247 245
@@ -250,7 +248,7 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
250 //set theme 248 //set theme
251 this.handleThemeSelection(); 249 this.handleThemeSelection();
252 //check autocomplete support 250 //check autocomplete support
253 this.handleCodeCompletionSupport(this.application.ninja.documentController.activeDocument.documentType); 251 this.handleCodeCompletionSupport(this.application.ninja.documentController.activeDocument.model.file.extension);
254 //set zoom 252 //set zoom
255 this.handleZoom(this._zoomFactor); 253 this.handleZoom(this._zoomFactor);
256 } 254 }
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index f6b850b2..7758f346 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -9,11 +9,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
9var Montage = require("montage/core/core").Montage, 9var Montage = require("montage/core/core").Montage,
10 Component = require("montage/ui/component").Component, 10 Component = require("montage/ui/component").Component,
11 Uuid = require("montage/core/uuid").Uuid, 11 Uuid = require("montage/core/uuid").Uuid,
12 HTMLDocument = require("js/document/html-document").HTMLDocument, 12 HTMLDocument = require("js/document/document-html").HtmlDocument,
13 TextDocument = require("js/document/text-document").TextDocument; 13 TextDocument = require("js/document/document-text").TextDocument;
14
15 // New Document Objects
16var Document = require("js/document/document-html").HtmlDocument;
17//////////////////////////////////////////////////////////////////////// 14////////////////////////////////////////////////////////////////////////
18// 15//
19var DocumentController = exports.DocumentController = Montage.create(Component, { 16var DocumentController = exports.DocumentController = Montage.create(Component, {
@@ -51,10 +48,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
51 if(!!this._activeDocument){ 48 if(!!this._activeDocument){
52 if(this._documents.indexOf(doc) === -1) this._documents.push(doc); 49 if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
53 this._activeDocument.isActive = true; 50 this._activeDocument.isActive = true;
54
55 if(!!this._activeDocument.editor){
56 this._activeDocument.editor.focus();
57 }
58 } 51 }
59 } 52 }
60 }, 53 },
@@ -311,42 +304,38 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
311 this.activeDocument.uri = fileUri; 304 this.activeDocument.uri = fileUri;
312 //save a new file 305 //save a new file
313 //use the ioMediator.fileSaveAll when implemented 306 //use the ioMediator.fileSaveAll when implemented
314 this.activeDocument._userDocument.name=filename; 307 this.activeDocument.model.file.name = filename;
315 this.activeDocument._userDocument.root=destination; 308 this.activeDocument.model.file.uri = fileUri;
316 this.activeDocument._userDocument.uri=fileUri; 309 this.activeDocument.model.save();
317 this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
318 //
319 } 310 }
320 }, 311 },
321 312
322 //////////////////////////////////////////////////////////////////// 313 ////////////////////////////////////////////////////////////////////
323 openDocument: { 314 openDocument: {
324 value: function(doc) { 315 value: function(file) {
325 var template, dimensions; 316 var template, dimensions;
326 if (doc.content.body.indexOf('Ninja-Banner Dimensions@@@') !== -1) {</