From da7ad067b146200847b543faf288844221dff928 Mon Sep 17 00:00:00 2001
From: Pushkar Joshi
Date: Mon, 30 Jan 2012 14:30:31 -0800
Subject: missed a couple of pen tool property files on last checkin
---
.../pen-properties.reel/pen-properties.html | 22 +++++++++++++++++++---
.../pen-properties.reel/pen-properties.js | 18 ++----------------
2 files changed, 21 insertions(+), 19 deletions(-)
(limited to 'js/components/tools-properties')
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index 7af35a03..74a3a747 100644
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -12,12 +12,25 @@
@@ -202,16 +292,16 @@
-
-
-
-
+
+
+
+
-
-
+
+
-
+
@@ -223,10 +313,10 @@
+
-
-
-
+
+
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js
index 313693b1..de0b5fa3 100644
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -25,8 +25,8 @@ exports.TextProperties = Montage.create(ToolProperties, {
alignCenter: {value: null},
alignRight: {value: null},
alignJustify: {value: null},
- indentRight: {value: null},
- indentLeft: {value: null},
+ indent: {value: null},
+ outdent: {value: null},
numberedList: {value: null},
bulletedList: {value: null},
@@ -42,9 +42,34 @@ exports.TextProperties = Montage.create(ToolProperties, {
this.alignCenter.label = "Center";
this.alignRight.label = "Right";
this.alignJustify.label = "Justify";
+ this.indent.label = "-->"
+ this.outdent.label = "<--";
+ this.numberedList.label = "1 2 3";
+ this.bulletedList.label = "• • •";
+ this.fontSelection.items = ["Arial", "Arial Black", "Courier New", "Garamond", "Georgia", "Open Sans", "Tahoma", "Times New Roman", "Trebuchet MS", "Verdana"];
+ this.tagType.items = ["div", "span", "p", "section", "article", "h1", "h2", "h3", "h4", "h5", "h6"];
+
+
+ this.application.ninja.stage.textTool.addEventListener("editorSelect", this, false);
+ Object.defineBinding(this.application.ninja.stage.textTool.states, "bold", {
+ boundObject: this.btnBold,
+ boundObjectPropertyPath: "value"
+ });
+
}
},
-
+
+ handleEditorSelect: {
+ value: function(e) {
+ console.log("hello");
+ this.application.ninja.stage.textTool.updateStates();
+ }
+ },
+
+ defaultFontSize: {
+ value: "12px"
+ },
+
_subPrepare: {
value: function() {
//this.divElement.addEventListener("click", this, false);
@@ -54,6 +79,122 @@ exports.TextProperties = Montage.create(ToolProperties, {
handleClick: {
value: function(event) {
// this.selectedElement = event._event.target.id;
+
+ }
+ },
+
+ handleFontSizeChange: {
+
+ },
+
+ handleBtnBoldAction: {
+ value: function(e) {
+ this.application.ninja.stage.textTool.doAction("bold", true);
+ }
+ },
+
+ handleBtnItalicAction: {
+ value: function(e) {
+ this.application.ninja.stage.textTool.doAction("italic", true);
+ }
+ },
+
+ handleBtnUnderlineAction: {
+ value: function(e) {
+ this.application.ninja.stage.textTool.doAction("underline", true);
+ }
+ },
+
+ handleBtnStrikethroughAction: {
+ value: function(e) {
+ this.application.ninja.stage.textTool.doAction("strikethrough", true);
+ }
+ },
+
+ handleAlignLeftAction: {
+ value: function(e) {
+ //this.alignLeft.value = false;
+ this.alignCenter.value = false;
+ this.alignRight.value = false;
+ this.alignJustify.value = false;
+ this.application.ninja.stage.textTool.doAction("justifyLeft", true);
+ }
+ },
+
+ handleAlignCenterAction: {
+ value: function(e) {
+ this.alignLeft.value = false;
+ //this.alignCenter.value = false;
+ this.alignRight.value = false;
+ this.alignJustify.value = false;
+ this.application.ninja.stage.textTool.doAction("justifyCenter", true);
}
- }
+ },
+
+ handleAlignRightAction: {
+ value: function(e) {
+ this.alignLeft.value = false;
+ this.alignCenter.value = false;
+ //this.alignRight.value = false;
+ this.alignJustify.value = false;
+ this.application.ninja.stage.textTool.doAction("justifyRight", true);
+ }
+ },
+
+ handleAlignJustifyAction: {
+ value: function(e) {
+ this.alignLeft.value = false;
+ this.alignCenter.value = false;
+ this.alignRight.value = false;
+ //this.alignJustify.value = false;
+ this.application.ninja.stage.textTool.doAction("strikethrough", null);
+ }
+ },
+
+ handleIndentAction: {
+ value: function(e) {
+ this.application.ninja.stage.textTool.doAction("indent", null);
+ }
+ },
+
+ handleOutdentAction: {
+ value: function(e) {
+ this.application.ninja.stage.textTool.doAction("outdent", null);
+ }
+ },
+
+ handleFontSizeChange: {
+ value: function(e) {
+
+ }
+ },
+
+ handleFontSizeChanging: {
+ value: function(e) {
+
+ }
+ },
+
+ handleFontSelectionChange: {
+ value: function() {
+ this.application.ninja.stage.textTool.doAction("fontname", this.fontSelection.value);
+ }
+ },
+
+ handleNumberedListAction: {
+ value: function(e) {
+ //this.numberedList.value = false;
+ this.bulletedList.value = false;
+ this.application.ninja.stage.textTool.doAction("insertnumberedlist", true);
+ }
+ },
+
+ handleOrderedListAction: {
+ value: function(e) {
+ this.numberedList.value = false;
+ //this.bulletedList.value = false;
+ this.application.ninja.stage.textTool.doAction("insertnumberedlist", true);
+ }
+ },
+
});
\ No newline at end of file
--
cgit v1.2.3
From 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Tue, 7 Feb 2012 16:43:22 -0800
Subject: Refactored rich text editor location
---
js/components/tools-properties/text-properties.reel/text-properties.js | 1 -
1 file changed, 1 deletion(-)
(limited to 'js/components/tools-properties')
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js
index de0b5fa3..dac30da0 100644
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -61,7 +61,6 @@ exports.TextProperties = Montage.create(ToolProperties, {
handleEditorSelect: {
value: function(e) {
- console.log("hello");
this.application.ninja.stage.textTool.updateStates();
}
},
--
cgit v1.2.3
From 9a404b8a717d0aac0eabb828a4d3cdc8c9c3eed8 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 7 Feb 2012 17:42:04 -0800
Subject: IKNINJA - 1084: Fixing the custom tag.
Signed-off-by: Valerio Virgillito
---
.../tools-properties/tag-properties.reel/tag-properties.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'js/components/tools-properties')
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 c7588b9e..2b81bb71 100644
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -56,9 +56,9 @@
--
cgit v1.2.3
From ce963d45cdf2703d2d4eedfa94394b178f86e0f1 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Thu, 9 Feb 2012 17:11:38 -0800
Subject: More Text Tool Updates
---
.../text-properties.reel/text-properties.css | 28 +--
.../text-properties.reel/text-properties.html | 204 +++++++++++----------
.../text-properties.reel/text-properties.js | 162 +++++++++++-----
3 files changed, 241 insertions(+), 153 deletions(-)
(limited to 'js/components/tools-properties')
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css
index 2eb608d3..6aa61812 100644
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -5,31 +5,33 @@
*/
.optionsTextTool {
- display: -webkit-box;
- -webkit-box-orient:horizontal;
- -webkit-box-align: stretch;
- padding: 5px;
+ padding: 6px;
}
-
-.optionsTextTool > * {
- -webkit-box-flex:0;
+.optionsTextTool .btnGroup {
+ padding: 0px 8px;
}
-.optionsTextTool .button {
- width: auto;
-
+.optionsTextTool > *, .optionsTextTool .btnGroup > * {
+ float:left;
}
-.optionsTextTool .hottextunit {
- padding-top:5px;
+.optionsTextTool button {
+ width: auto;
+ padding: 4px 8px !important;
+ margin-left:4px;
}
.optionsTextTool .label, .optionsTextTool .hottextunit {
- float:none;
font-size:11px;
}
.optionsTextTool .fontSelection {
width:100px;
+}
+
+.optionsTextTool .fontColor {
+ width: 20px;
+ height: 18px;
+ margin: 2px 6px;
}
\ No newline at end of file
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html
index 14123b12..7ded1236 100644
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -77,41 +77,30 @@
},
"fontSize": {
- "module": "js/components/hottextunit.reel",
- "name": "HotTextUnit",
+ "module": "js/components/combobox.reel",
+ "name": "Combobox",
"properties": {
"element": {"#": "fontSize"},
- "value": 12,
"identifier": "fontSize"
},
"listeners": [
{
"type": "change",
"listener": {"@": "owner"}
- },
- {
- "type": "changing",
- "listener": {"@": "owner"}
}
]
},
-
- "fontColor": {
- "module" : "js/components/ui/color-chip.reel",
- "name" : "ColorChip",
- "properties" : {
- "element" : {"#": "fontColor"},
- "mode": "chip"
- }
- },
+
"btnBold": {
- "module": "js/components/button.reel",
- "name": "Button",
+ "module": "montage/ui/toggle-button.reel",
+ "name": "ToggleButton",
"properties": {
"element": {"#": "btnBold"},
- "_isToggleButton": true,
- "identifier": "btnBold"
+ "pressedClass": "active",
+ "preventFocus": true,
+ "identifier": "btnBold",
+ "label": "B"
},
"listeners": [
{
@@ -121,12 +110,14 @@
]
},
"btnItalic": {
- "module": "js/components/button.reel",
- "name": "Button",
+ "module": "montage/ui/toggle-button.reel",
+ "name": "ToggleButton",
"properties": {
"element": {"#": "btnItalic"},
- "_isToggleButton": true,
- "identifier": "btnItalic"
+ "pressedClass": "active",
+ "preventFocus": true,
+ "identifier": "btnItalic",
+ "label": "I"
},
"listeners": [
{
@@ -136,12 +127,14 @@
]
},
"btnUnderline": {
- "module": "js/components/button.reel",
- "name": "Button",
+ "module": "montage/ui/toggle-button.reel",
+ "name": "ToggleButton",
"properties": {
"element": {"#": "btnUnderline"},
- "_isToggleButton": true,
- "identifier": "btnUnderline"
+ "pressedClass": "active",
+ "preventFocus": true,
+ "identifier": "btnUnderline",
+ "label": "U"
},
"listeners": [
{
@@ -151,12 +144,14 @@
]
},
"btnStrikethrough": {
- "module": "js/components/button.reel",
- "name": "Button",
+ "module": "montage/ui/toggle-button.reel",
+ "name": "ToggleButton",
"properties": {
"element": {"#": "btnStrikethrough"},
- "_isToggleButton": true,
- "identifier": "btnStrikethrough"
+ "pressedClass": "active",
+ "preventFocus": true,
+ "identifier": "btnStrikethrough",
+ "label": "S"
},
"listeners": [
{
@@ -165,28 +160,16 @@
}
]
},
- "txtLink": {
- "module": "js/components/textfield.reel",
- "name": "TextField",
- "properties": {
- "element": {"#": "txtLink"}
- }
- },
- "linkTarget": {
- "module": "js/components/combobox.reel",
- "name": "Combobox",
- "properties": {
- "element": {"#": "linkTarget"}
- }
- },
-
+
"alignLeft": {
- "module": "js/components/button.reel",
- "name": "Button",
+ "module": "montage/ui/toggle-button.reel",
+ "name": "ToggleButton",
"properties": {
"element": {"#": "alignLeft"},
- "_isToggleButton": true,
- "identifier": "alignLeft"
+ "pressedClass": "active",
+ "preventFocus": true,
+ "identifier": "alignLeft",
+ "label": "Left"
},
"listeners": [
{
@@ -196,12 +179,14 @@
]
},
"alignCenter": {
- "module": "js/components/button.reel",
- "name": "Button",
+ "module": "montage/ui/toggle-button.reel",
+ "name": "ToggleButton",
"properties": {
"element": {"#": "alignCenter"},
- "_isToggleButton": true,
- "identifier": "alignCenter"
+ "pressedClass": "active",
+ "preventFocus": true,
+ "identifier": "alignCenter",
+ "label": "Center"
},
"listeners": [
{
@@ -211,12 +196,14 @@
]
},
"alignRight": {
- "module": "js/components/button.reel",
- "name": "Button",
+ "module": "montage/ui/toggle-button.reel",
+ "name": "ToggleButton",
"properties": {
"element": {"#": "alignRight"},
- "_isToggleButton": true,
- "identifier": "alignRight"
+ "pressedClass": "active",
+ "preventFocus": true,
+ "identifier": "alignRight",
+ "label": "Right"
},
"listeners": [
{
@@ -226,12 +213,14 @@
]
},
"alignJustify": {
- "module": "js/components/button.reel",
- "name": "Button",
+ "module": "montage/ui/toggle-button.reel",
+ "name": "ToggleButton",
"properties": {
"element": {"#": "alignJustify"},
- "_isToggleButton": true,
- "identifier": "alignJustify"
+ "pressedClass": "active",
+ "preventFocus": true,
+ "identifier": "alignJustify",
+ "label": "Justify"
},
"listeners": [
{
@@ -241,26 +230,48 @@
]
},
"indent": {
- "module": "js/components/button.reel",
+ "module": "montage/ui/button.reel",
"name": "Button",
"properties": {
- "element": {"#": "indent"}
- }
+ "element": {"#": "indent"},
+ "pressedClass": "active",
+ "preventFocus": true,
+ "identifier": "outdent",
+ "label": ">>"
+ },
+ "listeners": [
+ {
+ "type": "action",
+ "listener": {"@": "owner"}
+ }
+ ]
},
"outdent": {
- "module": "js/components/button.reel",
+ "module": "montage/ui/button.reel",
"name": "Button",
"properties": {
- "element": {"#": "outdent"}
- }
+ "element": {"#": "outdent"},
+ "pressedClass": "active",
+ "preventFocus": true,
+ "identifier": "<<",
+ "label": "<<"
+ },
+ "listeners": [
+ {
+ "type": "action",
+ "listener": {"@": "owner"}
+ }
+ ]
},
"bulletedList": {
- "module": "js/components/button.reel",
- "name": "Button",
+ "module": "montage/ui/toggle-button.reel",
+ "name": "ToggleButton",
"properties": {
"element": {"#": "bulletedList"},
- "_isToggleButton": true,
- "identifier": "bulletedList"
+ "pressedClass": "active",
+ "preventFocus": true,
+ "identifier": "bulletedList",
+ "label": "• • •"
},
"listeners": [
{
@@ -270,12 +281,14 @@
]
},
"numberedList": {
- "module": "js/components/button.reel",
- "name": "Button",
+ "module": "montage/ui/toggle-button.reel",
+ "name": "ToggleButton",
"properties": {
"element": {"#": "numberedList"},
- "_isToggleButton": true,
- "identifier": "numberedList"
+ "pressedClass": "active",
+ "preventFocus": true,
+ "identifier": "numberedList",
+ "label": "1 2 3"
},
"listeners": [
{
@@ -301,24 +314,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js
index dac30da0..55274322 100644
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -32,30 +32,9 @@ exports.TextProperties = Montage.create(ToolProperties, {
prepareForDraw: {
value: function() {
- this.linkTarget.items = ["Target","_blank","_self","_parent", "_top"];
- this.fontSettings.label = "Settings";
- this.btnBold.label = "Bold";
- this.btnItalic.label = "Italic";
- this.btnUnderline.label = "Underline";
- this.btnStrikethrough.label = "Strikethrough";
- this.alignLeft.label = "Left";
- this.alignCenter.label = "Center";
- this.alignRight.label = "Right";
- this.alignJustify.label = "Justify";
- this.indent.label = "-->"
- this.outdent.label = "<--";
- this.numberedList.label = "1 2 3";
- this.bulletedList.label = "• • •";
this.fontSelection.items = ["Arial", "Arial Black", "Courier New", "Garamond", "Georgia", "Open Sans", "Tahoma", "Times New Roman", "Trebuchet MS", "Verdana"];
this.tagType.items = ["div", "span", "p", "section", "article", "h1", "h2", "h3", "h4", "h5", "h6"];
-
-
- this.application.ninja.stage.textTool.addEventListener("editorSelect", this, false);
- Object.defineBinding(this.application.ninja.stage.textTool.states, "bold", {
- boundObject: this.btnBold,
- boundObjectPropertyPath: "value"
- });
-
+ this.fontSize.items = ["8pt","10pt","12pt","14pt","18pt","24pt","36pt"];
}
},
@@ -65,10 +44,6 @@ exports.TextProperties = Montage.create(ToolProperties, {
}
},
- defaultFontSize: {
- value: "12px"
- },
-
_subPrepare: {
value: function() {
//this.divElement.addEventListener("click", this, false);
@@ -82,31 +57,27 @@ exports.TextProperties = Montage.create(ToolProperties, {
}
},
- handleFontSizeChange: {
-
- },
-
handleBtnBoldAction: {
value: function(e) {
- this.application.ninja.stage.textTool.doAction("bold", true);
+ this.application.ninja.stage.textTool.doAction("bold");
}
},
handleBtnItalicAction: {
value: function(e) {
- this.application.ninja.stage.textTool.doAction("italic", true);
+ this.application.ninja.stage.textTool.doAction("italic");
}
},
handleBtnUnderlineAction: {
value: function(e) {
- this.application.ninja.stage.textTool.doAction("underline", true);
+ this.application.ninja.stage.textTool.doAction("underline");
}
},
handleBtnStrikethroughAction: {
value: function(e) {
- this.application.ninja.stage.textTool.doAction("strikethrough", true);
+ this.application.ninja.stage.textTool.doAction("strikethrough");
}
},
@@ -116,7 +87,7 @@ exports.TextProperties = Montage.create(ToolProperties, {
this.alignCenter.value = false;
this.alignRight.value = false;
this.alignJustify.value = false;
- this.application.ninja.stage.textTool.doAction("justifyLeft", true);
+ this.application.ninja.stage.textTool.doAction("justifyleft");
}
},
@@ -126,7 +97,7 @@ exports.TextProperties = Montage.create(ToolProperties, {
//this.alignCenter.value = false;
this.alignRight.value = false;
this.alignJustify.value = false;
- this.application.ninja.stage.textTool.doAction("justifyCenter", true);
+ this.application.ninja.stage.textTool.doAction("justifycenter");
}
},
@@ -136,7 +107,7 @@ exports.TextProperties = Montage.create(ToolProperties, {
this.alignCenter.value = false;
//this.alignRight.value = false;
this.alignJustify.value = false;
- this.application.ninja.stage.textTool.doAction("justifyRight", true);
+ this.application.ninja.stage.textTool.doAction("justifyright");
}
},
@@ -146,37 +117,123 @@ exports.TextProperties = Montage.create(ToolProperties, {
this.alignCenter.value = false;
this.alignRight.value = false;
//this.alignJustify.value = false;
- this.application.ninja.stage.textTool.doAction("strikethrough", null);
+ this.application.ninja.stage.textTool.doAction("justifyfull");
}
},
handleIndentAction: {
value: function(e) {
- this.application.ninja.stage.textTool.doAction("indent", null);
+ this.application.ninja.stage.textTool.doAction("indent");
}
},
handleOutdentAction: {
value: function(e) {
- this.application.ninja.stage.textTool.doAction("outdent", null);
+ this.application.ninja.stage.textTool.doAction("outden