aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_scss/compass_app_log.txt7
-rw-r--r--_scss/imports/scss/_Stage.scss14
-rw-r--r--css/ninja.css4
-rw-r--r--js/panels/CSSPanel/CSSPanel.js6
-rw-r--r--js/stage/stage.reel/stage.html12
-rw-r--r--js/stage/stage.reel/stage.js7
-rw-r--r--js/tools/TextTool.js96
-rw-r--r--node_modules/montage/ui/rich-text-editor.reel/rich-text-editor.css112
-rw-r--r--node_modules/montage/ui/rich-text-editor.reel/rich-text-editor.html27
-rw-r--r--node_modules/montage/ui/rich-text-editor.reel/rich-text-editor.js1669
-rw-r--r--node_modules/montage/ui/rich-text-editor.reel/rich-text-resizer.js349
-rw-r--r--node_modules/montage/ui/rich-text-editor.reel/rich-text-sanitizer.js132
12 files changed, 10 insertions, 2425 deletions
diff --git a/_scss/compass_app_log.txt b/_scss/compass_app_log.txt
index d28e1e77..6fe64a6f 100644
--- a/_scss/compass_app_log.txt
+++ b/_scss/compass_app_log.txt
@@ -93,10 +93,3 @@
932012-01-20 15:16:38 overwrite ../css/ninja.css 932012-01-20 15:16:38 overwrite ../css/ninja.css
942012-01-20 15:17:03 overwrite ../css/ninja.css 942012-01-20 15:17:03 overwrite ../css/ninja.css
952012-01-20 15:17:39 overwrite ../css/ninja.css 952012-01-20 15:17:39 overwrite ../css/ninja.css
962012-01-30 16:28:54 overwrite ../css/ninja.css
972012-01-30 16:29:04 overwrite ../css/ninja.css
982012-01-30 16:33:31 overwrite ../css/ninja.css
992012-01-30 17:18:02 overwrite ../css/ninja.css
1002012-01-30 18:28:44 overwrite ../css/ninja.css
1012012-02-02 17:20:26 overwrite ../css/ninja.css
1022012-02-02 17:20:31 identical ../css/ninja.css
diff --git a/_scss/imports/scss/_Stage.scss b/_scss/imports/scss/_Stage.scss
index 09dae3d6..a992b793 100644
--- a/_scss/imports/scss/_Stage.scss
+++ b/_scss/imports/scss/_Stage.scss
@@ -192,17 +192,3 @@
192 overflow-x: auto; 192 overflow-x: auto;
193 overflow-y: auto; 193 overflow-y: auto;
194} 194}
195.montage-editor-frame {
196 position:absolute;
197 z-index:7;
198 top: 0;
199 left:0;
200 display:none;
201 -webkit-user-select: initial;
202}
203.montage-editor {
204 padding:0px;
205 word-wrap: normal;
206
207
208 } \ No newline at end of file
diff --git a/css/ninja.css b/css/ninja.css
index 7bc4c80e..2fcb1380 100644
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -271,10 +271,6 @@ background: transparent;
271 271
272#mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } 272#mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; }
273 273
274.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; }
275
276.montage-editor { padding: 0px; word-wrap: normal; }
277
278/* PanelUI.scss Styles governing the panels in the UI. Note that colors and font definitions go in _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss */ 274/* PanelUI.scss Styles governing the panels in the UI. Note that colors and font definitions go in _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss */
279/* layout for the container of all panels within a dock area */ 275/* layout for the container of all panels within a dock area */
280.panelContainer { margin: 0px; padding: 0px 0px; position: relative; /* 276.panelContainer { margin: 0px; padding: 0px 0px; position: relative; /*
diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js
index cf8880a3..94860b30 100644
--- a/js/panels/CSSPanel/CSSPanel.js
+++ b/js/panels/CSSPanel/CSSPanel.js
@@ -20,9 +20,9 @@ exports.CSSPanel = Montage.create(PanelBase, {
20 init : { 20 init : {
21 enumerable:true, 21 enumerable:true,
22 value : function (){ 22 value : function (){
23 this.minHeight = 195; 23 this.minHeight = 300;
24 this.contentHeight = 195; 24 this.contentHeight = 300;
25 this.defaultHeight= 195; 25 this.defaultHeight= 300;
26 26
27 /* OLD WAY -- Removing the temporary div 27 /* OLD WAY -- Removing the temporary div
28 // TODO: Remove this comment once this is tested. 28 // TODO: Remove this comment once this is tested.
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 07b823a7..49d10baf 100644
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -34,14 +34,6 @@
34 } 34 }
35 } 35 }
36 }, 36 },
37
38 "textTool": {
39 "module": "montage/ui/rich-text-editor.reel",
40 "name": "RichTextEditor",
41 "properties": {
42 "element" : {"#": "textToolObject"}
43 }
44 },
45 37
46 "owner": { 38 "owner": {
47 "module": "js/stage/stage.reel", 39 "module": "js/stage/stage.reel",
@@ -54,8 +46,7 @@
54 "_canvas": {"#": "stageCanvas"}, 46 "_canvas": {"#": "stageCanvas"},
55 "_drawingCanvas": {"#": "drawingCanvas"}, 47 "_drawingCanvas": {"#": "drawingCanvas"},
56 "stageDeps": {"@": "StageDeps1"}, 48 "stageDeps": {"@": "StageDeps1"},
57 "layout": {"@": "layout1"}, 49 "layout": {"@": "layout1"}
58 "textTool": {"@": "textTool"}
59 }, 50 },
60 "bindings": { 51 "bindings": {
61 "currentDocumentStageView": { 52 "currentDocumentStageView": {
@@ -73,7 +64,6 @@
73 64
74 <section id="stageAndScenesContainer" class="stageAndScenesContainer"> 65 <section id="stageAndScenesContainer" class="stageAndScenesContainer">
75 <section id="iframeContainer"></section> 66 <section id="iframeContainer"></section>
76 <section id="textToolObject">asdasd asd asd asd asd asd </section>
77 <section id="codeViewContainer"></section> 67 <section id="codeViewContainer"></section>
78 <canvas id="layoutCanvas"></canvas> 68 <canvas id="layoutCanvas"></canvas>
79 <canvas id="stageCanvas"></canvas> 69 <canvas id="stageCanvas"></canvas>
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 96bfccdd..3e0b852e 100644
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -12,7 +12,6 @@ var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
12 12
13exports.Stage = Montage.create(Component, { 13exports.Stage = Montage.create(Component, {
14 14
15 textTool: { value: null },
16 // TODO - Need to figure out how to remove this dependency 15 // TODO - Need to figure out how to remove this dependency
17 // Needed by some tools that depend on selectionDrawn event to set up some logic 16 // Needed by some tools that depend on selectionDrawn event to set up some logic
18 drawNow: { value : false }, 17 drawNow: { value : false },
@@ -781,12 +780,6 @@ exports.Stage = Montage.create(Component, {
781 } 780 }
782 }, 781 },
783 782
784 toViewportCoordinates: {
785 value: function(x,y) {
786 return [x + this._userContentLeft, y + this._userContentTop];
787 }
788 },
789
790 setZoom: { 783 setZoom: {
791 value: function(value) { 784 value: function(value) {
792 if(!this._firstDraw) 785 if(!this._firstDraw)
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js
index 8b48ff4f..538583ee 100644
--- a/js/tools/TextTool.js
+++ b/js/tools/TextTool.js
@@ -6,30 +6,12 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
6 6
7var Montage = require("montage/core/core").Montage, 7var Montage = require("montage/core/core").Montage,
8 DrawingTool = require("js/tools/drawing-tool").DrawingTool; 8 DrawingTool = require("js/tools/drawing-tool").DrawingTool;
9 RichTextEditor = require("montage/ui/rich-text-editor.reel").RichTextEditor;
10 9
11exports.TextTool = Montage.create(DrawingTool, { 10exports.TextTool = Montage.create(DrawingTool, {
12
13 _selectedElement: { value : null },
14
15 selectedElement: {
16 get: function() {
17 return this._selectedElement;
18 },
19 set: function(val) {
20 if(this._selectedElement !== null) {
21
22 }
23 this._selectedElement = val;
24 }
25 },
26
27
28 drawingFeedback: { value: { mode: "Draw3D", type: "rectangle" } }, 11 drawingFeedback: { value: { mode: "Draw3D", type: "rectangle" } },
29 12
30 HandleLeftButtonDown: { 13 HandleLeftButtonDown: {
31 value: function(event) { 14 value: function(event) {
32 this.deselectText();
33 this.startDraw(event); 15 this.startDraw(event);
34 } 16 }
35 }, 17 },
@@ -68,88 +50,24 @@ exports.TextTool = Montage.create(DrawingTool, {
68 if(drawData) { 50 if(drawData) {
69 //this.insertElement(drawData); 51 //this.insertElement(drawData);
70 } 52 }
71 53
72 this._hasDraw = false; 54 this._hasDraw = false;
73 this.endDraw(event); 55 this.endDraw(event);
74 } else { 56 } else {
57
75 this.doSelection(event); 58 this.doSelection(event);
76 console.log("im here");
77 if (this.application.ninja.selectedElements.length !== 0 ) {
78 this.selectedElement = this.application.ninja.selectedElements[0]._element;
79 this.drawTextTool();
80 }
81 59
82 this._isDrawing = false; 60 this._isDrawing = false;
83 } 61 }
84 } 62 }
85 }, 63 },
86 64
87 applyElementStyles : {
88 value: function(fromElement, toElement, styles) {
89 styles.forEach(function(style) {
90 var styleCamelCase = style.replace(/(\-[a-z])/g, function($1){return $1.toUpperCase().replace('-','');});
91 console.log(styleCamelCase, style, window.getComputedStyle(fromElement)[style]);
92 toElement.style[styleCamelCase] = window.getComputedStyle(fromElement)[style];
93 }, this);
94 }
95 },
96
97 drawTextTool: {
98 value: function() {
99 console.log(" now im here");
100 this.application.ninja.stage.textTool.value = this.selectedElement.innerHTML;
101 if(this.application.ninja.stage.textTool.value === "") { this.application.ninja.stage.textTool.value = " "; }
102 this.selectedElement.innerHTML = "";
103
104 //Styling Options for text tool to look identical to the text you are manipulating.
105 this.application.ninja.stage.textTool.element.style.display = "block";
106 this.application.ninja.stage.textTool.element.style.position = "a