Merge branch 'refs/heads/ninja-internal' into ToolFixes

author: Nivesh Rajbhandari 2012-03-13 13:05:33 -0700
committer: Nivesh Rajbhandari 2012-03-13 13:05:33 -0700
commit: 92fc2e3c4bca2edb04102431b4959aafe022f329 (patch)
tree: d48c090f71ed2cd6bd6ce38ff68c36ab69299985 /js/components
parent: efb92cf52680d31f05fed3757e74862592cc2d4c (diff)
parent: f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff)
download: ninja-92fc2e3c4bca2edb04102431b4959aafe022f329.tar.gz
4 files changed, 79 insertions, 31 deletions
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 38f7f856..608111bd 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -11,12 +11,55 @@
        <script type="text/montage-serialization">
        {
+            "strokeSizeHT": {
+                "module": "js/components/hottextunit.reel",
+                "name": "HotTextUnit",
+                "properties": {
+                    "element": {"#": "strokeSize"},
+                    "minValue": 1,
+                    "maxValue": 100,
+                    "value": 1,
+                    "decimalPlace": 10,
+                    "acceptableUnits" : ["px", "pt"]
+                }
+            },
+            "strokeHardnessHT": {
+                "module": "js/components/hottextunit.reel",
+                "name": "HotTextUnit",
+                "properties": {
+                    "element": {"#": "strokeHardness"},
+                    "minValue": 0,
+                    "maxValue": 100,
+                    "value": 100,
+                    "decimalPlace": 10,
+                    "acceptableUnits" : ["px", "pt"]
+                }
+            },
+            "strokeAngleHT": {
+                "module": "js/components/hottextunit.reel",
+                "name": "HotTextUnit",
+                "properties": {
+                    "element": {"#": "strokeAngle"},
+                    "minValue": -90,
+                    "maxValue": 90,
+                    "value": 0,
+                    "decimalPlace": 10,
+                    "acceptableUnits" : ["px", "pt"]
+                }
+            },
            "owner": {
                "module": "js/components/tools-properties/brush-properties.reel",
                "name": "BrushProperties",
                "properties": {
-                    "element": {"#": "brushProperties"}
+                    "element": {"#": "brushProperties"},
+                    "_strokeSize": {"@": "strokeSizeHT"},
+                    "_strokeHardness": {"@": "strokeHardnessHT"},
+                    "_doSmoothing": {"#": "doSmoothing"},
+                    "_useCalligraphic":{"#": "useCalligraphic"},
+                    "_strokeAngle": {"@": "strokeAngleHT"}
                }
            }
        }
@@ -26,6 +69,17 @@
    <body>
        <div id="brushProperties" class="subToolHolderPanel">
+            <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
+                <label class="label"> Width:</label>
+                <div id="strokeSize" class="label"></div>
+                <label class="label"> Hardness:</label>
+                <div id="strokeHardness" class="label"></div>
+                <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label>
+                <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label>
+                <label class="label"> Angle:</label>
+                <div id="strokeAngle" class="label"></div>
+            </div>
        </div>
    </body>
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js
index 92da98cc..e6faa0f0 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.js
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js
@@ -9,17 +9,19 @@ var Component = require("montage/ui/component").Component;
 var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
 exports.BrushProperties = Montage.create(ToolProperties, {
+    strokeSize: {
-    
+        get: function() { return this._strokeSize; }
-    _subPrepare: {
-        value: function() {
-            //this.divElement.addEventListener("click", this, false);
-        }
    },
+    strokeHardness: {
-    handleClick: {
+        get: function() { return this._strokeHardness; }
-        value: function(event) {
+    },
-           // this.selectedElement = event._event.target.id;
+    doSmoothing:{
-        }
+        get: function() {return this._doSmoothing.checked; }
+    },
+    useCalligraphic: {
+        get: function() {return this._useCalligraphic.checked;}
+    },
+    strokeAngle: {
+        get: function() {return this._strokeAngle;}
    }
-});
-\ No newline at end of file
+});
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js
index 72adbfa1..1ef6e277 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -174,21 +174,17 @@ var Icon = exports.Icon = Montage.create(Component, {
        enumerable: true,
        value:{
            "img_root":"images/picker/",
-            ".png":"png_file.png",
-            ".jpg":"jpeg_file.png",
            ".js":"js_file.png",
+            ".json":"json_file.png",
            ".css":"css_file.png",
            ".html":"html_file.png",
            ".xml":"xml_file.png",
            ".php":"php_file.png",
+            ".pl":"pl_file.png",
+            ".py":"py_file.png",
+            ".rb":"rb_file.png",
            ".doc":"doc_file.png",
-            ".docx":"doc_file.png",
+            ".txt":"txt_file.png",
-            ".rtf":"rtf_file.png",
-            ".pdf":"pdf_file.png",
-            ".zip":"zip_file.png",
-            ".rar":"zip_file.png",
-            ".app":"executable.png",
-            ".exe":"executable.png",
            "file_default":"file.png",
            "directory":"folder.png"
        }
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.js b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
index 4c71cb6b..a67dad43 100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.js
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
@@ -242,21 +242,17 @@ exports.TreeItem = Montage.create(Component, {
        enumerable: true,
        value:{
            "img_root":"images/picker/",
-            ".png":"png_file.png",
-            ".jpg":"jpeg_file.png",
            ".js":"js_file.png",
+            ".json":"json_file.png",
            ".css":"css_file.png",
            ".html":"html_file.png",
            ".xml":"xml_file.png",
            ".php":"php_file.png",
+            ".pl":"pl_file.png",
+            ".py":"py_file.png",
+            ".rb":"rb_file.png",
            ".doc":"doc_file.png",
-            ".docx":"doc_file.png",
+            ".txt":"txt_file.png",
-            ".rtf":"rtf_file.png",
-            ".pdf":"pdf_file.png",
-            ".zip":"zip_file.png",
-            ".rar":"zip_file.png",
-            ".app":"executable.png",
-            ".exe":"executable.png",
            "file_default":"file.png",
            "directory":"folder.png"
        }
author	Nivesh Rajbhandari	2012-03-13 13:05:33 -0700
committer	Nivesh Rajbhandari	2012-03-13 13:05:33 -0700
commit	92fc2e3c4bca2edb04102431b4959aafe022f329 (patch)
tree	d48c090f71ed2cd6bd6ce38ff68c36ab69299985 /js/components
parent	efb92cf52680d31f05fed3757e74862592cc2d4c (diff)
parent	f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff)
download	ninja-92fc2e3c4bca2edb04102431b4959aafe022f329.tar.gz

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 38f7f856..608111bd 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -11,12 +11,55 @@
11		11
12	<script type="text/montage-serialization">	12	<script type="text/montage-serialization">
13	{	13	{
		14	"strokeSizeHT": {
		15	"module": "js/components/hottextunit.reel",
		16	"name": "HotTextUnit",
		17	"properties": {
		18	"element": {"#": "strokeSize"},
		19	"minValue": 1,
		20	"maxValue": 100,
		21	"value": 1,
		22	"decimalPlace": 10,
		23	"acceptableUnits" : ["px", "pt"]
		24	}
		25	},
		26
		27	"strokeHardnessHT": {
		28	"module": "js/components/hottextunit.reel",
		29	"name": "HotTextUnit",
		30	"properties": {
		31	"element": {"#": "strokeHardness"},
		32	"minValue": 0,
		33	"maxValue": 100,
		34	"value": 100,
		35	"decimalPlace": 10,
		36	"acceptableUnits" : ["px", "pt"]
		37	}
		38	},
		39
		40	"strokeAngleHT": {
		41	"module": "js/components/hottextunit.reel",
		42	"name": "HotTextUnit",
		43	"properties": {
		44	"element": {"#": "strokeAngle"},
		45	"minValue": -90,
		46	"maxValue": 90,
		47	"value": 0,
		48	"decimalPlace": 10,
		49	"acceptableUnits" : ["px", "pt"]
		50	}
		51	},
14		52
15	"owner": {	53	"owner": {
16	"module": "js/components/tools-properties/brush-properties.reel",	54	"module": "js/components/tools-properties/brush-properties.reel",
17	"name": "BrushProperties",	55	"name": "BrushProperties",
18	"properties": {	56	"properties": {
19	"element": {"#": "brushProperties"}	57	"element": {"#": "brushProperties"},
		58	"_strokeSize": {"@": "strokeSizeHT"},
		59	"_strokeHardness": {"@": "strokeHardnessHT"},
		60	"_doSmoothing": {"#": "doSmoothing"},
		61	"_useCalligraphic":{"#": "useCalligraphic"},
		62	"_strokeAngle": {"@": "strokeAngleHT"}
20	}	63	}
21	}	64	}
22	}	65	}
@@ -26,6 +69,17 @@
26		69
27	<body>	70	<body>
28	<div id="brushProperties" class="subToolHolderPanel">	71	<div id="brushProperties" class="subToolHolderPanel">
		72	<div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
		73	<label class="label"> Width:</label>
		74	<div id="strokeSize" class="label"></div>
		75	<label class="label"> Hardness:</label>
		76	<div id="strokeHardness" class="label"></div>
		77	<label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label>
		78	<label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label>
		79	<label class="label"> Angle:</label>
		80	<div id="strokeAngle" class="label"></div>
		81
		82	</div>
29	</div>	83	</div>
30	</body>	84	</body>
31		85


diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js index 92da98cc..e6faa0f0 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.js +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js
@@ -9,17 +9,19 @@ var Component = require("montage/ui/component").Component;
9	var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;	9	var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
10		10
11	exports.BrushProperties = Montage.create(ToolProperties, {	11	exports.BrushProperties = Montage.create(ToolProperties, {
12		12	strokeSize: {
13		13	get: function() { return this._strokeSize; }
14	_subPrepare: {
15	value: function() {
16	//this.divElement.addEventListener("click", this, false);
17	}
18	},	14	},
19		15	strokeHardness: {
20	handleClick: {	16	get: function() { return this._strokeHardness; }
21	value: function(event) {	17	},
22	// this.selectedElement = event._event.target.id;	18	doSmoothing:{
23	}	19	get: function() {return this._doSmoothing.checked; }
		20	},
		21	useCalligraphic: {
		22	get: function() {return this._useCalligraphic.checked;}
		23	},
		24	strokeAngle: {
		25	get: function() {return this._strokeAngle;}
24	}	26	}
25	}); \ No newline at end of file	27	});


diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js index 72adbfa1..1ef6e277 100755 --- a/js/components/ui/icon-list-basic/icon.reel/icon.js +++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -174,21 +174,17 @@ var Icon = exports.Icon = Montage.create(Component, {
174	enumerable: true,	174	enumerable: true,
175	value:{	175	value:{
176	"img_root":"images/picker/",	176	"img_root":"images/picker/",
177	".png":"png_file.png",
178	".jpg":"jpeg_file.png",
179	".js":"js_file.png",	177	".js":"js_file.png",
		178	".json":"json_file.png",
180	".css":"css_file.png",	179	".css":"css_file.png",
181	".html":"html_file.png",	180	".html":"html_file.png",
182	".xml":"xml_file.png",	181	".xml":"xml_file.png",
183	".php":"php_file.png",	182	".php":"php_file.png",
		183	".pl":"pl_file.png",
		184	".py":"py_file.png",
		185	".rb":"rb_file.png",
184	".doc":"doc_file.png",	186	".doc":"doc_file.png",
185	".docx":"doc_file.png",	187	".txt":"txt_file.png",
186	".rtf":"rtf_file.png",
187	".pdf":"pdf_file.png",
188	".zip":"zip_file.png",
189	".rar":"zip_file.png",
190	".app":"executable.png",
191	".exe":"executable.png",
192	"file_default":"file.png",	188	"file_default":"file.png",
193	"directory":"folder.png"	189	"directory":"folder.png"
194	}	190	}


diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.js b/js/components/ui/tree-basic/treeItem.reel/treeItem.js index 4c71cb6b..a67dad43 100755 --- a/js/components/ui/tree-basic/treeItem.reel/treeItem.js +++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
@@ -242,21 +242,17 @@ exports.TreeItem = Montage.create(Component, {
242	enumerable: true,	242	enumerable: true,
243	value:{	243	value:{
244	"img_root":"images/picker/",	244	"img_root":"images/picker/",
245	".png":"png_file.png",
246	".jpg":"jpeg_file.png",
247	".js":"js_file.png",	245	".js":"js_file.png",
		246	".json":"json_file.png",
248	".css":"css_file.png",	247	".css":"css_file.png",
249	".html":"html_file.png",	248	".html":"html_file.png",
250	".xml":"xml_file.png",	249	".xml":"xml_file.png",
251	".php":"php_file.png",	250	".php":"php_file.png",
		251	".pl":"pl_file.png",
		252	".py":"py_file.png",
		253	".rb":"rb_file.png",
252	".doc":"doc_file.png",	254	".doc":"doc_file.png",
253	".docx":"doc_file.png",	255	".txt":"txt_file.png",
254	".rtf":"rtf_file.png",
255	".pdf":"pdf_file.png",
256	".zip":"zip_file.png",
257	".rar":"zip_file.png",
258	".app":"executable.png",
259	".exe":"executable.png",
260	"file_default":"file.png",	256	"file_default":"file.png",
261	"directory":"folder.png"	257	"directory":"folder.png"
262	}	258	}