6 files changed, 457 insertions, 457 deletions
diff --git a/js/panels/Materials/MaterialsPanel.js b/js/panels/Materials/MaterialsPanel.js
index 9d7f447a..4291f39b 100755
--- a/js/panels/Materials/MaterialsPanel.js
+++ b/js/panels/Materials/MaterialsPanel.js
@@ -29,8 +29,8 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 var Montage = require("montage/core/core").Montage,
-        PanelBase = require("js/panels/PanelBase").PanelBase,
+    PanelBase = require("js/panels/PanelBase").PanelBase,
-    MaterialsLibraryPanel =     require("js/panels/Materials/materials-library-panel.reel").MaterialsLibraryPanel;
+    MaterialsLibraryPanel = require("js/panels/Materials/materials-library-panel.reel").MaterialsLibraryPanel;
 exports.MaterialsPanel = Montage.create(PanelBase, {
    id : {value : "materialsPanel", writable:true, enumerable:true, configurable:true},
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index f77d3186..3204ce50 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -29,16 +29,16 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
 <html lang="en">
-        <head>
+    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <link rel="stylesheet" type="text/css" href="materials-library-panel.css">
+        <link rel="stylesheet" type="text/css" href="materials-library-panel.css">
         <script type="text/montage-serialization">
        {
            "addButton": {
                "prototype": "montage/ui/button.reel",
                "properties": {
                    "element": {"#": "ml_add_btn"},
-                                        "enabled": false
+                    "enabled": false
                },
                "listeners": [
                    {
@@ -51,7 +51,7 @@ POSSIBILITY OF SUCH DAMAGE.
                "prototype": "montage/ui/button.reel",
                "properties": {
                    "element": {"#": "ml_copy_btn"},
-                                        "enabled": false
+                    "enabled": false
               },
                "listeners": [
                    {
@@ -64,7 +64,7 @@ POSSIBILITY OF SUCH DAMAGE.
                "prototype": "montage/ui/button.reel",
                "properties": {
                    "element": {"#": "ml_delete_btn"},
-                                        "enabled": false
+                    "enabled": false
               },
                "listeners": [
                    {
@@ -109,13 +109,13 @@ POSSIBILITY OF SUCH DAMAGE.
                    "_materialInfo": {"@": "materialInfo"}
                }
            }
-        }
+        }
-                </script>
+        </script>
-                
+        
-        </head>
+    </head>
-        <body>
+    <body>
-        <div data-montage-id="materials_library_panel" class="materials_library_panel">
+        <div data-montage-id="materials_library_panel" class="materials_library_panel">
            <section data-montage-id="ml_tree_holder" class="animationsLibrary">
                <div data-montage-id="materials_library_tree"></div>
            </section>
@@ -125,7 +125,7 @@ POSSIBILITY OF SUCH DAMAGE.
                <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button>
                <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button>
            </div>
-        </div>
+        </div>
    </body>
 </html>
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
index b5d6bb96..1cf3cec7 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
@@ -40,8 +40,8 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
    },
    _hasFocus: {
-        enumerable: false,
+        enumerable: false,
-        value: false
+        value: false
    },
    didCreate: {
@@ -98,10 +98,10 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
    },
    
    _showMaterialPopup: {
-        enumerable: false,
+        enumerable: false,
-        value: function (materialObj) {
+        value: function (materialObj) {
-                        if(!this._materialPopup)
+            if(!this._materialPopup)
            {
                this._materialPopup = Popup.create();
                this._materialPopup.content = this._materialInfo;
@@ -113,15 +113,15 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
            materialID = materialObj.materialId;
            this._materialInfo.loadMaterials(materialID,  materialObj.useSelection, materialObj.whichMaterial);
-        }
+        }
    },
    handleHideMaterialPopup: {
-        enumerable: false,
+        enumerable: false,
-        value: function (event) {
+        value: function (event) {
            if(this._materialPopup){
                this._materialPopup.hide();
            }
-        }
+        }
    }
 });
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css
index a5362615..3ddc8a98 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.css
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.css
@@ -105,8 +105,8 @@ POSSIBILITY OF SUCH DAMAGE.
 .mp_properties_list > .mp_property > .colortoolbar
 {
-        width: 27px !important;
+    width: 27px !important;
-        height: 27px !important;
+    height: 27px !important;
    overflow:hidden !important;
    margin-top: -6px;
 }
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index b377fa2d..eb2433e3 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -29,13 +29,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
 <html lang="en">
-        <head>
+    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <link rel="stylesheet" type="text/css" href="materials-popup.css">
+        <link rel="stylesheet" type="text/css" href="materials-popup.css">
-                <script type="text/montage-serialization">
+        <script type="text/montage-serialization">
        {
            "okButton": {
                "prototype": "montage/ui/button.reel",
@@ -109,13 +109,13 @@ POSSIBILITY OF SUCH DAMAGE.
        }

diff --git a/js/panels/Materials/MaterialsPanel.js b/js/panels/Materials/MaterialsPanel.js index 9d7f447a..4291f39b 100755 --- a/js/panels/Materials/MaterialsPanel.js +++ b/js/panels/Materials/MaterialsPanel.js
@@ -29,8 +29,8 @@ POSSIBILITY OF SUCH DAMAGE.
29	</copyright> */	29	</copyright> */
30		30
31	var Montage = require("montage/core/core").Montage,	31	var Montage = require("montage/core/core").Montage,
32	PanelBase = require("js/panels/PanelBase").PanelBase,	32	PanelBase = require("js/panels/PanelBase").PanelBase,
33	MaterialsLibraryPanel = require("js/panels/Materials/materials-library-panel.reel").MaterialsLibraryPanel;	33	MaterialsLibraryPanel = require("js/panels/Materials/materials-library-panel.reel").MaterialsLibraryPanel;
34		34
35	exports.MaterialsPanel = Montage.create(PanelBase, {	35	exports.MaterialsPanel = Montage.create(PanelBase, {
36	id : {value : "materialsPanel", writable:true, enumerable:true, configurable:true},	36	id : {value : "materialsPanel", writable:true, enumerable:true, configurable:true},


diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html index f77d3186..3204ce50 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -29,16 +29,16 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29	POSSIBILITY OF SUCH DAMAGE.	29	POSSIBILITY OF SUCH DAMAGE.
30	</copyright> -->	30	</copyright> -->
31	<html lang="en">	31	<html lang="en">
32	<head>	32	<head>
33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
34	<link rel="stylesheet" type="text/css" href="materials-library-panel.css">	34	<link rel="stylesheet" type="text/css" href="materials-library-panel.css">
35	<script type="text/montage-serialization">	35	<script type="text/montage-serialization">
36	{	36	{
37	"addButton": {	37	"addButton": {
38	"prototype": "montage/ui/button.reel",	38	"prototype": "montage/ui/button.reel",
39	"properties": {	39	"properties": {
40	"element": {"#": "ml_add_btn"},	40	"element": {"#": "ml_add_btn"},
41	"enabled": false	41	"enabled": false
42	},	42	},
43	"listeners": [	43	"listeners": [
44	{	44	{
@@ -51,7 +51,7 @@ POSSIBILITY OF SUCH DAMAGE.
51	"prototype": "montage/ui/button.reel",	51	"prototype": "montage/ui/button.reel",
52	"properties": {	52	"properties": {
53	"element": {"#": "ml_copy_btn"},	53	"element": {"#": "ml_copy_btn"},
54	"enabled": false	54	"enabled": false
55	},	55	},
56	"listeners": [	56	"listeners": [
57	{	57	{
@@ -64,7 +64,7 @@ POSSIBILITY OF SUCH DAMAGE.
64	"prototype": "montage/ui/button.reel",	64	"prototype": "montage/ui/button.reel",
65	"properties": {	65	"properties": {
66	"element": {"#": "ml_delete_btn"},	66	"element": {"#": "ml_delete_btn"},
67	"enabled": false	67	"enabled": false
68	},	68	},
69	"listeners": [	69	"listeners": [
70	{	70	{
@@ -109,13 +109,13 @@ POSSIBILITY OF SUCH DAMAGE.
109	"_materialInfo": {"@": "materialInfo"}	109	"_materialInfo": {"@": "materialInfo"}
110	}	110	}
111	}	111	}
112	}	112	}
113	</script>	113	</script>
114		114
115	</head>	115	</head>
116	<body>	116	<body>
117		117
118	<div data-montage-id="materials_library_panel" class="materials_library_panel">	118	<div data-montage-id="materials_library_panel" class="materials_library_panel">
119	<section data-montage-id="ml_tree_holder" class="animationsLibrary">	119	<section data-montage-id="ml_tree_holder" class="animationsLibrary">
120	<div data-montage-id="materials_library_tree"></div>	120	<div data-montage-id="materials_library_tree"></div>
121	</section>	121	</section>
@@ -125,7 +125,7 @@ POSSIBILITY OF SUCH DAMAGE.
125	<button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button>	125	<button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button>
126	<button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button>	126	<button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button>
127	</div>	127	</div>
128	</div>	128	</div>
129		129
130	</body>	130	</body>
131	</html>	131	</html>


diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js index b5d6bb96..1cf3cec7 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
@@ -40,8 +40,8 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
40	},	40	},
41		41
42	_hasFocus: {	42	_hasFocus: {
43	enumerable: false,	43	enumerable: false,
44	value: false	44	value: false
45	},	45	},
46		46
47	didCreate: {	47	didCreate: {
@@ -98,10 +98,10 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
98	},	98	},
99		99
100	_showMaterialPopup: {	100	_showMaterialPopup: {
101	enumerable: false,	101	enumerable: false,
102	value: function (materialObj) {	102	value: function (materialObj) {
103		103
104	if(!this._materialPopup)	104	if(!this._materialPopup)
105	{	105	{
106	this._materialPopup = Popup.create();	106	this._materialPopup = Popup.create();
107	this._materialPopup.content = this._materialInfo;	107	this._materialPopup.content = this._materialInfo;
@@ -113,15 +113,15 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
113		113
114	materialID = materialObj.materialId;	114	materialID = materialObj.materialId;
115	this._materialInfo.loadMaterials(materialID, materialObj.useSelection, materialObj.whichMaterial);	115	this._materialInfo.loadMaterials(materialID, materialObj.useSelection, materialObj.whichMaterial);
116	}	116	}
117	},	117	},
118		118
119	handleHideMaterialPopup: {	119	handleHideMaterialPopup: {
120	enumerable: false,	120	enumerable: false,
121	value: function (event) {	121	value: function (event) {
122	if(this._materialPopup){	122	if(this._materialPopup){
123	this._materialPopup.hide();	123	this._materialPopup.hide();
124	}	124	}
125	}	125	}
126	}	126	}
127	});	127	});


diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css index a5362615..3ddc8a98 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.css +++ b/js/panels/Materials/materials-popup.reel/materials-popup.css
@@ -105,8 +105,8 @@ POSSIBILITY OF SUCH DAMAGE.
105		105
106	.mp_properties_list > .mp_property > .colortoolbar	106	.mp_properties_list > .mp_property > .colortoolbar
107	{	107	{
108	width: 27px !important;	108	width: 27px !important;
109	height: 27px !important;	109	height: 27px !important;
110	overflow:hidden !important;	110	overflow:hidden !important;
111	margin-top: -6px;	111	margin-top: -6px;
112	}	112	}


diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index b377fa2d..eb2433e3 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -29,13 +29,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29	POSSIBILITY OF SUCH DAMAGE.	29	POSSIBILITY OF SUCH DAMAGE.
30	</copyright> -->	30	</copyright> -->
31	<html lang="en">	31	<html lang="en">
32	<head>	32	<head>
33		33
34	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	34	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
35		35
36	<link rel="stylesheet" type="text/css" href="materials-popup.css">	36	<link rel="stylesheet" type="text/css" href="materials-popup.css">
37		37
38	<script type="text/montage-serialization">	38	<script type="text/montage-serialization">
39	{	39	{
40	"okButton": {	40	"okButton": {
41	"prototype": "montage/ui/button.reel",	41	"prototype": "montage/ui/button.reel",
@@ -109,13 +109,13 @@ POSSIBILITY OF SUCH DAMAGE.
109	}	109	}