Merge branch 'refs/heads/master' into CSSPanelUpdates

author: Eric Guzman 2012-04-23 11:55:55 -0700
committer: Eric Guzman 2012-04-23 11:55:55 -0700
commit: cdd1189e349e2974681e2c451e861e5b0db570e4 (patch)
tree: d8823c3d050e011032c563d20c1a5f61e67ae740 /js
parent: c0fce534c255ef1e25779e2f0e8de95bb4e160cf (diff)
parent: 5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff)
download: ninja-cdd1189e349e2974681e2c451e861e5b0db570e4.tar.gz
53 files changed, 1374 insertions, 2175 deletions
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html
index 0374e6a3..a9fbfbd9 100755
--- a/js/components/colorwheel.reel/colorwheel.html
+++ b/js/components/colorwheel.reel/colorwheel.html
@@ -12,15 +12,7 @@
        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
        
        <link rel="stylesheet" type="text/css" href="css/colorwheel.css">
-                
-                <script type="text/m-objects">
-                {
-                        "$rootObject": U("m-obj://colorwheel/uuid?mId=js/components/colorwheel", {
-                        "element": E("#colorwheel")
-                        })
-                }
-                </script>
-                
                <script type="text/montage-serialization">
                        {
                "owner": {
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index 361e36b2..f71c6705 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -12,15 +12,7 @@
        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
        
        <link rel="stylesheet" type="text/css" href="css/gradientpicker.css">
-                
-                <script type="text/m-objects">
-                {
-                        "$rootObject": U("m-obj://gradientpicker/uuid?mId=js/components/gradientpicker", {
-                        "element": E("#gradientpicker")
-                        })
-                }
-                </script>
-                
                <script type="text/montage-serialization">
                        {
                "owner": {
diff --git a/js/components/tree.reel/tree.css b/js/components/tree.reel/tree.css
deleted file mode 100755
index 8872341f..00000000
--- a/js/components/tree.reel/tree.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-.tree
-{
-    -webkit-user-select:none;
-    cursor:default;
-    float: left;
-    padding-left: 0;
-}
-.tree li
-{
-    -webkit-margin-before: 0px;
-    -webkit-margin-after: 0px;
-    list-style-type:none;
-}
-.tree li > text > img
-{
-    margin-right:8px;
-    -webkit-transition: -webkit-transform 0.05s linear;
-}
-\ No newline at end of file
diff --git a/js/components/tree.reel/tree.html b/js/components/tree.reel/tree.html
deleted file mode 100755
index 66838d82..00000000
--- a/js/components/tree.reel/tree.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<!-- <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> -->
-<html>
-<head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <script type="text/montage-serialization">
-        {
-            "owner": {
-                "module": "js/components/tree.reel",
-                "name": "Tree",
-                "properties": {
-                    "element": {"#": "tree"}
-                }
-            }
-        }
-                </script>
-</head>
-<body>
-<ul id="tree" class="tree">
-</ul>
-</body>
-</html>
-\ No newline at end of file
diff --git a/js/components/tree.reel/tree.js b/js/components/tree.reel/tree.js
deleted file mode 100755
index 7084ba99..00000000
--- a/js/components/tree.reel/tree.js
+++ /dev/null
@@ -1,789 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-var Montage = require("montage/core/core").Montage;
-var Component = require("montage/ui/component").Component;
-var nj = require("js/lib/NJUtils").NJUtils;
-exports.Tree = Montage.create(Component, {
-    _treeDepth: {
-        value: 1
-    },
-    treeDepth: {
-        get: function() {
-                return this._treeDepth;
-        },
-        set: function(value) {
-                this._treeDepth = value;
-        }
-    },
-    _depthHash: {
-        value: ""
-    },
-    depthHash: {
-        get: function() {
-                return this._depthHash;
-        },
-        set: function(strValue) {
-                this._depthHash = strValue;
-        }
-    },
-    _firstLevel: {
-        value: true
-    },
-    firstLevel: {
-        get: function() {
-                return this._firstLevel;
-        },
-        set: function(value) {
-                this._firstLevel = value;
author	Eric Guzman	2012-04-23 11:55:55 -0700
committer	Eric Guzman	2012-04-23 11:55:55 -0700
commit	cdd1189e349e2974681e2c451e861e5b0db570e4 (patch)
tree	d8823c3d050e011032c563d20c1a5f61e67ae740 /js
parent	c0fce534c255ef1e25779e2f0e8de95bb4e160cf (diff)
parent	5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff)
download	ninja-cdd1189e349e2974681e2c451e861e5b0db570e4.tar.gz

diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html index 0374e6a3..a9fbfbd9 100755 --- a/js/components/colorwheel.reel/colorwheel.html +++ b/js/components/colorwheel.reel/colorwheel.html
@@ -12,15 +12,7 @@
12	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	12	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
13		13
14	<link rel="stylesheet" type="text/css" href="css/colorwheel.css">	14	<link rel="stylesheet" type="text/css" href="css/colorwheel.css">
15		15
16	<script type="text/m-objects">
17	{
18	"$rootObject": U("m-obj://colorwheel/uuid?mId=js/components/colorwheel", {
19	"element": E("#colorwheel")
20	})
21	}
22	</script>
23
24	<script type="text/montage-serialization">	16	<script type="text/montage-serialization">
25	{	17	{
26	"owner": {	18	"owner": {


diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html index 361e36b2..f71c6705 100755 --- a/js/components/gradientpicker.reel/gradientpicker.html +++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -12,15 +12,7 @@
12	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	12	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
13		13
14	<link rel="stylesheet" type="text/css" href="css/gradientpicker.css">	14	<link rel="stylesheet" type="text/css" href="css/gradientpicker.css">
15		15
16	<script type="text/m-objects">
17	{
18	"$rootObject": U("m-obj://gradientpicker/uuid?mId=js/components/gradientpicker", {
19	"element": E("#gradientpicker")
20	})
21	}
22	</script>
23
24	<script type="text/montage-serialization">	16	<script type="text/montage-serialization">
25	{	17	{
26	"owner": {	18	"owner": {


diff --git a/js/components/tree.reel/tree.css b/js/components/tree.reel/tree.css deleted file mode 100755 index 8872341f..00000000 --- a/js/components/tree.reel/tree.css +++ /dev/null
@@ -1,26 +0,0 @@
1	/* <copyright>
2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5	</copyright> */
6
7	.tree
8	{
9	-webkit-user-select:none;
10	cursor:default;
11	float: left;
12	padding-left: 0;
13	}
14
15	.tree li
16	{
17	-webkit-margin-before: 0px;
18	-webkit-margin-after: 0px;
19	list-style-type:none;
20	}
21
22	.tree li > text > img
23	{
24	margin-right:8px;
25	-webkit-transition: -webkit-transform 0.05s linear;
26	} \ No newline at end of file


diff --git a/js/components/tree.reel/tree.html b/js/components/tree.reel/tree.html deleted file mode 100755 index 66838d82..00000000 --- a/js/components/tree.reel/tree.html +++ /dev/null
@@ -1,28 +0,0 @@
1	<!DOCTYPE HTML>
2	<!-- <copyright>
3	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
5	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
6	</copyright> -->
7	<html>
8	<head>
9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
10	<script type="text/montage-serialization">
11	{
12	"owner": {
13	"module": "js/components/tree.reel",
14	"name": "Tree",
15	"properties": {
16	"element": {"#": "tree"}
17	}
18	}
19
20	}
21	</script>
22
23	</head>
24	<body>
25	<ul id="tree" class="tree">
26	</ul>
27	</body>
28	</html> \ No newline at end of file


diff --git a/js/components/tree.reel/tree.js b/js/components/tree.reel/tree.js deleted file mode 100755 index 7084ba99..00000000 --- a/js/components/tree.reel/tree.js +++ /dev/null
@@ -1,789 +0,0 @@
1	/* <copyright>
2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5	</copyright> */
6
7	var Montage = require("montage/core/core").Montage;
8	var Component = require("montage/ui/component").Component;
9	var nj = require("js/lib/NJUtils").NJUtils;
10
11	exports.Tree = Montage.create(Component, {
12
13	_treeDepth: {
14	value: 1
15	},
16	treeDepth: {
17	get: function() {
18	return this._treeDepth;
19	},
20	set: function(value) {
21	this._treeDepth = value;
22	}
23	},
24	_depthHash: {
25	value: ""
26	},
27	depthHash: {
28	get: function() {
29	return this._depthHash;
30	},
31	set: function(strValue) {
32	this._depthHash = strValue;
33	}
34	},
35	_firstLevel: {
36	value: true
37	},
38	firstLevel: {
39	get: function() {
40	return this._firstLevel;
41	},
42	set: function(value) {
43	this._firstLevel = value;