From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 27 Jan 2012 12:05:17 -0800 Subject: Merged old FileIO --- js/components/tools-properties/brush-properties.reel/brush-properties.css | 0 .../tools-properties/brush-properties.reel/brush-properties.html | 0 js/components/tools-properties/brush-properties.reel/brush-properties.js | 0 .../tools-properties/eraser-properties.reel/eraser-properties.css | 0 .../tools-properties/eraser-properties.reel/eraser-properties.html | 0 .../tools-properties/eraser-properties.reel/eraser-properties.js | 0 .../tools-properties/eyedropper-properties.reel/eyedropper-properties.css | 0 .../eyedropper-properties.reel/eyedropper-properties.html | 0 .../tools-properties/eyedropper-properties.reel/eyedropper-properties.js | 0 js/components/tools-properties/fill-properties.reel/fill-properties.css | 0 js/components/tools-properties/fill-properties.reel/fill-properties.html | 0 js/components/tools-properties/fill-properties.reel/fill-properties.js | 0 .../tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css | 0 .../ink-bottle-properties.reel/ink-bottle-properties.html | 0 .../tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js | 0 js/components/tools-properties/line-properties.reel/line-properties.css | 0 js/components/tools-properties/line-properties.reel/line-properties.html | 0 js/components/tools-properties/line-properties.reel/line-properties.js | 0 .../tools-properties/object3d-properties.reel/object3d-properties.html | 0 .../tools-properties/object3d-properties.reel/object3d-properties.js | 0 js/components/tools-properties/oval-properties.reel/oval-properties.css | 0 js/components/tools-properties/oval-properties.reel/oval-properties.html | 0 js/components/tools-properties/oval-properties.reel/oval-properties.js | 0 js/components/tools-properties/pan-properties.reel/pan-properties.css | 0 js/components/tools-properties/pan-properties.reel/pan-properties.html | 0 js/components/tools-properties/pan-properties.reel/pan-properties.js | 0 js/components/tools-properties/pen-properties.reel/pen-properties.css | 0 js/components/tools-properties/pen-properties.reel/pen-properties.html | 0 js/components/tools-properties/pen-properties.reel/pen-properties.js | 0 .../tools-properties/pencil-properties.reel/pencil-properties.css | 0 .../tools-properties/pencil-properties.reel/pencil-properties.html | 0 .../tools-properties/pencil-properties.reel/pencil-properties.js | 0 js/components/tools-properties/rect-properties.reel/rect-properties.css | 0 js/components/tools-properties/rect-properties.reel/rect-properties.html | 0 js/components/tools-properties/rect-properties.reel/rect-properties.js | 0 .../rotate-stage-properties.reel/rotate-stage-properties.css | 0 .../rotate-stage-properties.reel/rotate-stage-properties.html | 0 .../rotate-stage-properties.reel/rotate-stage-properties.js | 0 .../tools-properties/selection-properties.reel/selection-properties.css | 0 .../tools-properties/selection-properties.reel/selection-properties.html | 0 .../tools-properties/selection-properties.reel/selection-properties.js | 0 js/components/tools-properties/shape-properties.reel/shape-properties.css | 0 .../tools-properties/shape-properties.reel/shape-properties.html | 0 js/components/tools-properties/shape-properties.reel/shape-properties.js | 0 .../subselection-properties.reel/subselection-properties.html | 0 .../subselection-properties.reel/subselection-properties.js | 0 js/components/tools-properties/tag-properties.reel/tag-properties.css | 0 js/components/tools-properties/tag-properties.reel/tag-properties.html | 0 js/components/tools-properties/tag-properties.reel/tag-properties.js | 0 js/components/tools-properties/text-properties.reel/text-properties.css | 0 js/components/tools-properties/text-properties.reel/text-properties.html | 0 js/components/tools-properties/text-properties.reel/text-properties.js | 0 js/components/tools-properties/tool-properties.js | 0 js/components/tools-properties/zoom-properties.reel/zoom-properties.css | 0 js/components/tools-properties/zoom-properties.reel/zoom-properties.html | 0 js/components/tools-properties/zoom-properties.reel/zoom-properties.js | 0 56 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 js/components/tools-properties/brush-properties.reel/brush-properties.css mode change 100644 => 100755 js/components/tools-properties/brush-properties.reel/brush-properties.html mode change 100644 => 100755 js/components/tools-properties/brush-properties.reel/brush-properties.js mode change 100644 => 100755 js/components/tools-properties/eraser-properties.reel/eraser-properties.css mode change 100644 => 100755 js/components/tools-properties/eraser-properties.reel/eraser-properties.html mode change 100644 => 100755 js/components/tools-properties/eraser-properties.reel/eraser-properties.js mode change 100644 => 100755 js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.css mode change 100644 => 100755 js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html mode change 100644 => 100755 js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js mode change 100644 => 100755 js/components/tools-properties/fill-properties.reel/fill-properties.css mode change 100644 => 100755 js/components/tools-properties/fill-properties.reel/fill-properties.html mode change 100644 => 100755 js/components/tools-properties/fill-properties.reel/fill-properties.js mode change 100644 => 100755 js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css mode change 100644 => 100755 js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html mode change 100644 => 100755 js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js mode change 100644 => 100755 js/components/tools-properties/line-properties.reel/line-properties.css mode change 100644 => 100755 js/components/tools-properties/line-properties.reel/line-properties.html mode change 100644 => 100755 js/components/tools-properties/line-properties.reel/line-properties.js mode change 100644 => 100755 js/components/tools-properties/object3d-properties.reel/object3d-properties.html mode change 100644 => 100755 js/components/tools-properties/object3d-properties.reel/object3d-properties.js mode change 100644 => 100755 js/components/tools-properties/oval-properties.reel/oval-properties.css mode change 100644 => 100755 js/components/tools-properties/oval-properties.reel/oval-properties.html mode change 100644 => 100755 js/components/tools-properties/oval-properties.reel/oval-properties.js mode change 100644 => 100755 js/components/tools-properties/pan-properties.reel/pan-properties.css mode change 100644 => 100755 js/components/tools-properties/pan-properties.reel/pan-properties.html mode change 100644 => 100755 js/components/tools-properties/pan-properties.reel/pan-properties.js mode change 100644 => 100755 js/components/tools-properties/pen-properties.reel/pen-properties.css mode change 100644 => 100755 js/components/tools-properties/pen-properties.reel/pen-properties.html mode change 100644 => 100755 js/components/tools-properties/pen-properties.reel/pen-properties.js mode change 100644 => 100755 js/components/tools-properties/pencil-properties.reel/pencil-properties.css mode change 100644 => 100755 js/components/tools-properties/pencil-properties.reel/pencil-properties.html mode change 100644 => 100755 js/components/tools-properties/pencil-properties.reel/pencil-properties.js mode change 100644 => 100755 js/components/tools-properties/rect-properties.reel/rect-properties.css mode change 100644 => 100755 js/components/tools-properties/rect-properties.reel/rect-properties.html mode change 100644 => 100755 js/components/tools-properties/rect-properties.reel/rect-properties.js mode change 100644 => 100755 js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.css mode change 100644 => 100755 js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html mode change 100644 => 100755 js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.js mode change 100644 => 100755 js/components/tools-properties/selection-properties.reel/selection-properties.css mode change 100644 => 100755 js/components/tools-properties/selection-properties.reel/selection-properties.html mode change 100644 => 100755 js/components/tools-properties/selection-properties.reel/selection-properties.js mode change 100644 => 100755 js/components/tools-properties/shape-properties.reel/shape-properties.css mode change 100644 => 100755 js/components/tools-properties/shape-properties.reel/shape-properties.html mode change 100644 => 100755 js/components/tools-properties/shape-properties.reel/shape-properties.js mode change 100644 => 100755 js/components/tools-properties/subselection-properties.reel/subselection-properties.html mode change 100644 => 100755 js/components/tools-properties/subselection-properties.reel/subselection-properties.js mode change 100644 => 100755 js/components/tools-properties/tag-properties.reel/tag-properties.css mode change 100644 => 100755 js/components/tools-properties/tag-properties.reel/tag-properties.html mode change 100644 => 100755 js/components/tools-properties/tag-properties.reel/tag-properties.js mode change 100644 => 100755 js/components/tools-properties/text-properties.reel/text-properties.css mode change 100644 => 100755 js/components/tools-properties/text-properties.reel/text-properties.html mode change 100644 => 100755 js/components/tools-properties/text-properties.reel/text-properties.js mode change 100644 => 100755 js/components/tools-properties/tool-properties.js mode change 100644 => 100755 js/components/tools-properties/zoom-properties.reel/zoom-properties.css mode change 100644 => 100755 js/components/tools-properties/zoom-properties.reel/zoom-properties.html mode change 100644 => 100755 js/components/tools-properties/zoom-properties.reel/zoom-properties.js (limited to 'js/components/tools-properties') diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.css b/js/components/tools-properties/brush-properties.reel/brush-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.css b/js/components/tools-properties/eraser-properties.reel/eraser-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.js b/js/components/tools-properties/eraser-properties.reel/eraser-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.css b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.css b/js/components/tools-properties/fill-properties.reel/fill-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.js b/js/components/tools-properties/fill-properties.reel/fill-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/line-properties.reel/line-properties.css b/js/components/tools-properties/line-properties.reel/line-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/line-properties.reel/line-properties.html b/js/components/tools-properties/line-properties.reel/line-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/line-properties.reel/line-properties.js b/js/components/tools-properties/line-properties.reel/line-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.css b/js/components/tools-properties/oval-properties.reel/oval-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.js b/js/components/tools-properties/oval-properties.reel/oval-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/pan-properties.reel/pan-properties.css b/js/components/tools-properties/pan-properties.reel/pan-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/pan-properties.reel/pan-properties.html b/js/components/tools-properties/pan-properties.reel/pan-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/pan-properties.reel/pan-properties.js b/js/components/tools-properties/pan-properties.reel/pan-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.css b/js/components/tools-properties/pen-properties.reel/pen-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.css b/js/components/tools-properties/pencil-properties.reel/pencil-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html b/js/components/tools-properties/pencil-properties.reel/pencil-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.js b/js/components/tools-properties/pencil-properties.reel/pencil-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.css b/js/components/tools-properties/rect-properties.reel/rect-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.js b/js/components/tools-properties/rect-properties.reel/rect-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.css b/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html b/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.js b/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.css b/js/components/tools-properties/selection-properties.reel/selection-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.js b/js/components/tools-properties/selection-properties.reel/selection-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html b/js/components/tools-properties/subselection-properties.reel/subselection-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/subselection-properties.reel/subselection-properties.js b/js/components/tools-properties/subselection-properties.reel/subselection-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.css b/js/components/tools-properties/tag-properties.reel/tag-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/tool-properties.js b/js/components/tools-properties/tool-properties.js old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/zoom-properties.reel/zoom-properties.css b/js/components/tools-properties/zoom-properties.reel/zoom-properties.css old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/zoom-properties.reel/zoom-properties.html b/js/components/tools-properties/zoom-properties.reel/zoom-properties.html old mode 100644 new mode 100755 diff --git a/js/components/tools-properties/zoom-properties.reel/zoom-properties.js b/js/components/tools-properties/zoom-properties.reel/zoom-properties.js old mode 100644 new mode 100755 -- cgit v1.2.3 From d7ead10b566e7de121b2cd2c99fecca8469d63b8 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Tue, 7 Feb 2012 16:30:47 -0800 Subject: Initial Text tool completion. --- .../text-properties.reel/text-properties.css | 4 +- .../text-properties.reel/text-properties.html | 202 +++++++++++++++------ .../text-properties.reel/text-properties.js | 149 ++++++++++++++- 3 files changed, 294 insertions(+), 61 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 d581c6c3..2eb608d3 100644 --- a/js/components/tools-properties/text-properties.reel/text-properties.css +++ b/js/components/tools-properties/text-properties.reel/text-properties.css @@ -30,4 +30,6 @@ font-size:11px; } - +.optionsTextTool .fontSelection { + width:100px; +} \ 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 fb57c06d..14123b12 100644 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html @@ -33,8 +33,8 @@ "alignCenter": {"@": "alignCenter"}, "alignRight": {"@": "alignRight"}, "alignJustify": {"@": "alignJustify"}, - "indentRight": {"@": "indentRight"}, - "indentLeft": {"@": "indentLeft"}, + "indent": {"@": "indent"}, + "outdent": {"@": "outdent"}, "numberedList": {"@": "numberedList"}, "bulletedList": {"@": "bulletedList"} } @@ -57,8 +57,16 @@ "module": "js/components/combobox.reel", "name": "Combobox", "properties": { - "element": {"#": "fontSelection"} - } + "element": {"#": "fontSelection"}, + "identifier": "fontSelection" + }, + "listeners": [ + { + "type": "change", + "listener": {"@": "owner"} + } + ] + }, "fontSettings": { "module": "js/components/button.reel", @@ -72,48 +80,90 @@ "module": "js/components/hottextunit.reel", "name": "HotTextUnit", "properties": { - "element": {"#": "fontSize"} - } - }, + "element": {"#": "fontSize"}, + "value": 12, + "identifier": "fontSize" + }, + "listeners": [ + { + "type": "change", + "listener": {"@": "owner"} + }, + { + "type": "changing", + "listener": {"@": "owner"} + } + ] - "fontColor": { - "module": "js/components/button.reel", - "name": "Button", - "properties": { - "element": {"#": "fontColor"} - } }, + + "fontColor": { + "module" : "js/components/ui/color-chip.reel", + "name" : "ColorChip", + "properties" : { + "element" : {"#": "fontColor"}, + "mode": "chip" + } + }, "btnBold": { "module": "js/components/button.reel", "name": "Button", "properties": { "element": {"#": "btnBold"}, - "_isToggleButton": true - } + "_isToggleButton": true, + "identifier": "btnBold" + }, + "listeners": [ + { + "type": "action", + "listener": {"@": "owner"} + } + ] }, "btnItalic": { "module": "js/components/button.reel", "name": "Button", "properties": { "element": {"#": "btnItalic"}, - "_isToggleButton": true - } + "_isToggleButton": true, + "identifier": "btnItalic" + }, + "listeners": [ + { + "type": "action", + "listener": {"@": "owner"} + } + ] }, "btnUnderline": { "module": "js/components/button.reel", "name": "Button", "properties": { "element": {"#": "btnUnderline"}, - "_isToggleButton": true - } + "_isToggleButton": true, + "identifier": "btnUnderline" + }, + "listeners": [ + { + "type": "action", + "listener": {"@": "owner"} + } + ] }, "btnStrikethrough": { "module": "js/components/button.reel", "name": "Button", "properties": { "element": {"#": "btnStrikethrough"}, - "_isToggleButton": true - } + "_isToggleButton": true, + "identifier": "btnStrikethrough" + }, + "listeners": [ + { + "type": "action", + "listener": {"@": "owner"} + } + ] }, "txtLink": { "module": "js/components/textfield.reel", @@ -134,66 +184,106 @@ "module": "js/components/button.reel", "name": "Button", "properties": { - "element": {"#": "alignLeft"} - } + "element": {"#": "alignLeft"}, + "_isToggleButton": true, + "identifier": "alignLeft" + }, + "listeners": [ + { + "type": "action", + "listener": {"@": "owner"} + } + ] }, "alignCenter": { "module": "js/components/button.reel", "name": "Button", "properties": { - "element": {"#": "alignCenter"} - } + "element": {"#": "alignCenter"}, + "_isToggleButton": true, + "identifier": "alignCenter" + }, + "listeners": [ + { + "type": "action", + "listener": {"@": "owner"} + } + ] }, "alignRight": { "module": "js/components/button.reel", "name": "Button", "properties": { - "element": {"#": "alignRight"} - } + "element": {"#": "alignRight"}, + "_isToggleButton": true, + "identifier": "alignRight" + }, + "listeners": [ + { + "type": "action", + "listener": {"@": "owner"} + } + ] }, "alignJustify": { "module": "js/components/button.reel", "name": "Button", "properties": { - "element": {"#": "alignJustify"} - } + "element": {"#": "alignJustify"}, + "_isToggleButton": true, + "identifier": "alignJustify" + }, + "listeners": [ + { + "type": "action", + "listener": {"@": "owner"} + } + ] }, - "indentRight": { + "indent": { "module": "js/components/button.reel", "name": "Button", "properties": { - "element": {"#": "indentRight"} + "element": {"#": "indent"} } }, - "indentLeft": { + "outdent": { "module": "js/components/button.reel", "name": "Button", "properties": { - "element": {"#": "indentLeft"} + "element": {"#": "outdent"} } }, "bulletedList": { "module": "js/components/button.reel", "name": "Button", "properties": { - "element": {"#": "bulletedList"} - } + "element": {"#": "bulletedList"}, + "_isToggleButton": true, + "identifier": "bulletedList" + }, + "listeners": [ + { + "type": "action", + "listener": {"@": "owner"} + } + ] }, "numberedList": { "module": "js/components/button.reel", "name": "Button", "properties": { - "element": {"#": "numberedList"} - } - }, - "fontColor": { - "module" : "js/components/ui/color-chip.reel", - "name" : "ColorChip", - "properties" : { - "element" : {"#": "fontColor"}, - "mode": "chip" - } - } + "element": {"#": "numberedList"}, + "_isToggleButton": true, + "identifier": "numberedList" + }, + "listeners": [ + { + "type": "action", + "listener": {"@": "owner"} + } + ] + } } @@ -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 8a2ef825490358f992d6d687174b0a16fd8302c1 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Wed, 8 Feb 2012 10:48:52 -0800 Subject: Squashed commit of the following: commit 763910b9d074137eb7dee80447b89407ce5750c9 Merge: e557937 329a859 Author: Valerio Virgillito Date: Wed Feb 8 10:18:36 2012 -0800 Merge pull request #20 from mqg734/ToolFixes Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs: commit e5579374ff39b80b8c0c69faba37f6f581758fe0 Author: Valerio Virgillito Date: Tue Feb 7 13:28:17 2012 -0800 updated montage v.0.6 to the latest changes. Signed-off-by: Valerio Virgillito commit 329a859e2666716c3a1d99c6bd2679e10c81fc8d Author: Nivesh Rajbhandari Date: Tue Feb 7 15:25:11 2012 -0800 Added ability to toggle combobox's visibility so we can show/hide materials comboboxes in the tool options. Signed-off-by: Nivesh Rajbhandari commit 668510892537eaaeb2e11520831d87b44b2489b7 Merge: 8950b34 c066fb4 Author: Valerio Virgillito Date: Tue Feb 7 14:19:22 2012 -0800 Merge pull request #19 from ericguzman/TreeComponents Tree Components - Added copyright comments commit aec849d91e4b697d496b9ede28b5d89cf2283781 Author: Nivesh Rajbhandari Date: Tue Feb 7 14:18:13 2012 -0800 id's must start with a letter, so our workaround for using uuid for RDGE canvas id's won't work because they often start with a number. Signed-off-by: Nivesh Rajbhandari commit e8e21367e59bb521801fe2e843f42ad5bca5ea9f Author: Nivesh Rajbhandari Date: Tue Feb 7 13:52:54 2012 -0800 Fixing some typos and undeclared variables in GLRectangle and ShapesController. Signed-off-by: Nivesh Rajbhandari commit c066fb41ebee85bacf9b2155366b16831af41d76 Author: Eric Guzman Date: Tue Feb 7 13:46:05 2012 -0800 Tree Components - Added copyright comments commit 3a8875c288049b466bfeb8b7f0510fd8cbfb970d Author: Nivesh Rajbhandari Date: Tue Feb 7 13:30:08 2012 -0800 Supporting switching materials in the PI. Also, moved makeFillMaterial and makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari commit 8ad767b61460984a4031ba630f76ac8247a61857 Author: Nivesh Rajbhandari Date: Tue Feb 7 11:42:10 2012 -0800 Fixed PI to support WebGL materials. Signed-off-by: Nivesh Rajbhandari commit 486842239c71e7964f38a09aacda4970f2a82e1a Author: Nivesh Rajbhandari Date: Tue Feb 7 10:58:14 2012 -0800 Updated tools and PI to get/set materials by binding to appModel's materials property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari commit 789eaf5a92c903f27462c69a8890fbec695ab14e Merge: 92ae17b 8950b34 Author: Nivesh Rajbhandari Date: Tue Feb 7 09:36:29 2012 -0800 Merge branch 'refs/heads/ninja-internal' into ToolFixes commit 92ae17bc800cf82cdbd1482ef1af1a5fd7bd632a Author: Nivesh Rajbhandari Date: Mon Feb 6 16:35:12 2012 -0800 Force layout canvas and SelectionController to update their info when a 2d canvas is replaced by a 3d canvas (and vice-versa). Signed-off-by: Nivesh Rajbhandari commit 75486be2839494c9b54833aff8f5eef3f9542151 Author: Nivesh Rajbhandari Date: Mon Feb 6 15:41:48 2012 -0800 Support toggling between 2d and 3d canvas context. This requires us to create a new canvas with all the same values as the canvas being replaced and copying over all the shape data. Signed-off-by: Nivesh Rajbhandari commit f94b0c5ada403379b3ff8a900c2a2aabcecce49e Author: Nivesh Rajbhandari Date: Mon Feb 6 14:03:40 2012 -0800 Add enabled property for ComboBox to support enabling/disabling materials dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari commit 5737864d1d55d96e3cc3c1bc9b38ec58303b3981 Author: Nivesh Rajbhandari Date: Mon Feb 6 13:35:30 2012 -0800 Allow users to switch between 2d and webGL mode. Note that this doesn't currently work. Signed-off-by: Nivesh Rajbhandari commit 486d9a31a85dd833a1c798049a00403756703034 Author: Nivesh Rajbhandari Date: Mon Feb 6 11:35:49 2012 -0800 Support use WebGL checkbox in the PI. Signed-off-by: Nivesh Rajbhandari Signed-off-by: Jonathan Duran --- .../fill-properties.reel/fill-properties.html | 11 ++++++- .../fill-properties.reel/fill-properties.js | 6 +++- .../ink-bottle-properties.html | 12 +++++++- .../ink-bottle-properties.js | 6 +++- .../line-properties.reel/line-properties.js | 14 ++++++--- .../oval-properties.reel/oval-properties.js | 14 ++++++--- .../rect-properties.reel/rect-properties.js | 14 ++++++--- .../shape-properties.reel/shape-properties.css | 6 +--- .../shape-properties.reel/shape-properties.html | 35 +++++++++++++-------- .../shape-properties.reel/shape-properties.js | 36 ++++++++++++++-------- 10 files changed, 109 insertions(+), 45 deletions(-) (limited to 'js/components/tools-properties') diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html index d09b7f44..a35f9b15 100644 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html @@ -11,6 +11,15 @@