From b8dc3c42715274e61b34dc3c65e023078123f2e2 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 30 Apr 2012 15:34:16 -0700 Subject: fixing the menu and tool properties Signed-off-by: Valerio Virgillito --- .../brush-properties.reel/brush-properties.html | 10 +++--- .../eraser-properties.reel/eraser-properties.html | 2 +- .../eyedropper-properties.html | 2 +- .../fill-properties.reel/fill-properties.html | 10 +++--- .../line-properties.reel/line-properties.html | 2 +- .../object3d-properties.html | 6 ++-- .../oval-properties.reel/oval-properties.html | 4 +-- .../pan-properties.reel/pan-properties.html | 2 +- .../pen-properties.reel/pen-properties.html | 4 +-- .../pencil-properties.reel/pencil-properties.html | 2 +- .../rect-properties.reel/rect-properties.html | 12 ++++---- .../rotate-stage-properties.html | 2 +- .../selection-properties.html | 2 +- .../shape-properties.reel/shape-properties.html | 26 ++++++++-------- .../subselection-properties.html | 2 +- .../tag-properties.reel/tag-properties.html | 18 +++++------ .../text-properties.reel/text-properties.html | 36 +++++++++++----------- .../zoom-properties.reel/zoom-properties.html | 6 ++-- 18 files changed, 74 insertions(+), 74 deletions(-) (limited to 'js/components/tools-properties') diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index b0c02734..e7aaf0e8 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html @@ -80,16 +80,16 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html index 7585bbb4..c13f5d65 100755 --- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html +++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html @@ -24,7 +24,7 @@ -
+
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html index 1cde7a3e..6f420673 100755 --- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html +++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html @@ -24,7 +24,7 @@ -
+
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 b81b09ba..77a0af5e 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html @@ -34,13 +34,13 @@ -
- +
+ -
+
-
-
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.html b/js/components/tools-properties/line-properties.reel/line-properties.html index a8fc194e..0033b8a7 100755 --- a/js/components/tools-properties/line-properties.reel/line-properties.html +++ b/js/components/tools-properties/line-properties.reel/line-properties.html @@ -23,7 +23,7 @@ -
+
\ No newline at end of file diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html index 58c29db5..1c9505a0 100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html @@ -29,10 +29,10 @@ -
+
- - + +
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html index e460f7ea..c76e8c39 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.html +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html @@ -35,9 +35,9 @@ -
+
-
+
diff --git a/js/components/tools-properties/pan-properties.reel/pan-properties.html b/js/components/tools-properties/pan-properties.reel/pan-properties.html index 54dbcda7..fd6dbc6d 100755 --- a/js/components/tools-properties/pan-properties.reel/pan-properties.html +++ b/js/components/tools-properties/pan-properties.reel/pan-properties.html @@ -24,7 +24,7 @@ -
+
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 e835f69d..b3221456 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html @@ -38,9 +38,9 @@
-
+
-
+
diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html b/js/components/tools-properties/pencil-properties.reel/pencil-properties.html index fc5f541e..cbe626b2 100755 --- a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html +++ b/js/components/tools-properties/pencil-properties.reel/pencil-properties.html @@ -24,7 +24,7 @@ -
+
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html index 47eff533..01f2b1da 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.html +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html @@ -74,17 +74,17 @@ -
+
- +
-
+
-
+
-
+
-
+
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 index 55af6b54..1e3b9e4d 100755 --- 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 @@ -24,7 +24,7 @@ -
+
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html index f0b907af..728ffb0a 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.html +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html @@ -25,7 +25,7 @@ -
+
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html index 117664a3..6d58fe80 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html @@ -127,30 +127,30 @@ -
-
-
+
+
+
-
+
-
-
-
+
+
+
- + - -
+ +
- -
- diff --git a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html b/js/components/tools-properties/subselection-properties.reel/subselection-properties.html index 79460f93..bde47659 100755 --- a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html +++ b/js/components/tools-properties/subselection-properties.reel/subselection-properties.html @@ -24,7 +24,7 @@ -
+
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 c80ba36e..bbac6724 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html @@ -35,26 +35,26 @@ -
+
- - - - - + + + + +
 
- @@ -66,7 +66,7 @@
- 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 03786d76..1e96d349 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html @@ -296,36 +296,36 @@ -
+
- + - + - - + + - +
- - - - + + + +
- - - - + + + +
- - + +
- - + +
diff --git a/js/components/tools-properties/zoom-properties.reel/zoom-properties.html b/js/components/tools-properties/zoom-properties.reel/zoom-properties.html index e36d7ca7..cf22b775 100755 --- a/js/components/tools-properties/zoom-properties.reel/zoom-properties.html +++ b/js/components/tools-properties/zoom-properties.reel/zoom-properties.html @@ -26,10 +26,10 @@ -
+
- - + +
-- cgit v1.2.3 From d2a5fcbaed6b3c3377edecbc27e6a2818b79be40 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 2 May 2012 15:34:49 -0700 Subject: Nesting absolute element in the Tag tool. Refactoring element creation and element models Signed-off-by: Valerio Virgillito --- .../tools-properties/tag-properties.reel/tag-properties.html | 12 ++++++------ .../tools-properties/tag-properties.reel/tag-properties.js | 6 +++--- 2 files changed, 9 insertions(+), 9 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 c80ba36e..4ea9c659 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html @@ -37,11 +37,11 @@
- - - - - + + + + +
 
@@ -67,10 +67,10 @@ diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js index 1caabc35..6519d5b8 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.js +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js @@ -33,9 +33,9 @@ exports.TagProperties = Montage.create(ToolProperties, { handleClick: { value: function(event) { - this.selectedElement = event._event.target.id; + this.selectedElement = event._event.target.value; - if(this.selectedElement === "customTool") { + if(this.selectedElement === "custom") { this.customName.style["display"] = ""; this.customLabel.style["display"] = ""; } else { @@ -46,7 +46,7 @@ exports.TagProperties = Montage.create(ToolProperties, { }, _selectedElement: { - value: "divTool", enumerable: false + value: "div", enumerable: false }, selectedElement: { -- cgit v1.2.3 From 2f21eb37a4e7afb4ba3273b3ec50964717448b2f Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 3 May 2012 17:16:04 -0700 Subject: Removing more id and changing the appropriate CSS for them Signed-off-by: Valerio Virgillito --- js/components/tools-properties/pen-properties.reel/pen-properties.html | 2 +- .../selection-properties.reel/selection-properties.html | 2 +- 2 files changed, 2 insertions(+), 2 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 b3221456..68ab85f6 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html @@ -38,7 +38,7 @@
-
+
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html index 728ffb0a..b93aacd0 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.html +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html @@ -26,7 +26,7 @@
- +
-- cgit v1.2.3 From dc93269cfa7c315d22d85c8217e2412749643f28 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 3 May 2012 22:51:10 -0700 Subject: Removing unused components references Signed-off-by: Valerio Virgillito --- .../tools-properties/text-properties.reel/text-properties.html | 3 --- 1 file changed, 3 deletions(-) (limited to 'js/components/tools-properties') 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 1e96d349..7fbec1da 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html @@ -21,13 +21,10 @@ "fontSelection": {"@": "fontSelection"}, "fontSettings": {"@": "fontSettings"}, "fontSize": {"@": "fontSize"}, - "fontColor": {"@": "fontColor"}, "btnBold": {"@": "btnBold"}, "btnItalic": {"@": "btnItalic"}, "btnUnderline": {"@": "btnUnderline"}, "btnStrikethrough": {"@": "btnStrikethrough"}, - "txtLink": {"@": "txtLink"}, - "linkTarget": {"@": "linkTarget"}, "alignLeft": {"@": "alignLeft"}, "alignCenter": {"@": "alignCenter"}, "alignRight": {"@": "alignRight"}, -- cgit v1.2.3