From bcfb200482c26b2bfc0d6577b1eb0de7a19a6762 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Thu, 26 Apr 2012 16:23:59 -0700 Subject: Removing all "module" declarations and replaced with "prototype" in preparation for montage converting to the new "prototype" format fully --- .../brush-properties.reel/brush-properties.html | 17 +++---- .../eraser-properties.reel/eraser-properties.html | 5 +- .../eyedropper-properties.html | 5 +- .../fill-properties.reel/fill-properties.html | 8 ++-- .../ink-bottle-properties.html | 14 ++---- .../line-properties.reel/line-properties.html | 5 +- .../object3d-properties.html | 5 +- .../oval-properties.reel/oval-properties.html | 8 ++-- .../pan-properties.reel/pan-properties.html | 5 +- .../pen-properties.reel/pen-properties.html | 8 ++-- .../pencil-properties.reel/pencil-properties.html | 5 +- .../rect-properties.reel/rect-properties.html | 17 +++---- .../rotate-stage-properties.html | 5 +- .../selection-properties.html | 3 +- .../shape-properties.reel/shape-properties.html | 27 ++++------- .../subselection-properties.html | 5 +- .../tag-properties.reel/tag-properties.html | 3 +- .../text-properties.reel/text-properties.html | 56 ++++++++-------------- .../zoom-properties.reel/zoom-properties.html | 5 +- 19 files changed, 74 insertions(+), 132 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 d9c35dc2..b0c02734 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html @@ -1,4 +1,4 @@ - + - +
-
+
-
+
-
+
-
+
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