diff options
author | Eric Guzman | 2012-06-13 19:07:54 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-13 19:07:54 -0700 |
commit | 3a2b178e93767b6e4f463fbc0a44e4b0d00ceec9 (patch) | |
tree | 88b4abb0b7f67f7b638b8594e926654a0bef60e3 /js/panels | |
parent | 98c6f4c449587addbeebb805ae0d15c4fe956f4f (diff) | |
download | ninja-3a2b178e93767b6e4f463fbc0a44e4b0d00ceec9.tar.gz |
Objects Panel - Fix CSS to simplify showing object icons in other panels
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/objects/object.reel/object.css | 2 | ||||
-rw-r--r-- | js/panels/objects/object.reel/object.html | 5 | ||||
-rw-r--r-- | js/panels/objects/object.reel/object.js | 29 |
3 files changed, 9 insertions, 27 deletions
diff --git a/js/panels/objects/object.reel/object.css b/js/panels/objects/object.reel/object.css index 2612c392..64b2dbcc 100644 --- a/js/panels/objects/object.reel/object.css +++ b/js/panels/objects/object.reel/object.css | |||
@@ -54,7 +54,7 @@ | |||
54 | box-shadow: 0 0 1px 1px #474747; | 54 | box-shadow: 0 0 1px 1px #474747; |
55 | } | 55 | } |
56 | 56 | ||
57 | .object-icon-component .object-icon { | 57 | .object-icon-component.object-icon { |
58 | /* gray gear */ | 58 | /* gray gear */ |
59 | background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAACE5JREFUWIWdV2tsHNUV%2Fu6989iHd9frtVeJsUNsEW8AOYSkTUgs9SVKoahSUdpKSC0toBapSEhBVuFPsOxfFInSP6hCgoigVhS1IFVtgKBKaaIoxBFOChF1bceubRI7btbe3cyOZ%2BbOffRHPKP1I63cK11p5%2BzMOd853znnnkuwyTUwMIBSqdTKGOswTTOjtUYYho7jOFcmJibKL7300qb0GZsFQClNbN%2B%2B%2FWhXV9f9ACwA0FrzycnJv83NzR0C4G1K32YBSCltAD25XC6Zy%2BVYLpdjzc3NScZYDyHEbny3v7%2F%2Ff%2BrbMAJDQ0NwXbdg2%2FY%2Bx3E%2BfOWVV3Sk0DAMyzTNNKWrsRuGkWaMWdHz4cOHIaXE4ODgg57njbz44ovXN7JF1gqef%2F55FIvFXXv37n1z586du0%2BePPnG2NjYL0zTNLdu3frtbdu2%2FejOO%2B%2F8ajabZY3fOY4jR0dHT09PT%2F92YWHhuFIq2L179y%2F379%2F%2F04WFhc8uXrz44%2FHx8U%2BHhoZuDWBoaAjpdHrXgQMH3unp6dlJKYXv%2B3J0dHQ4k8nkOzs7S6lU6pa0aa3huq6am5sbD4Jgsaen5z7TNJlSCvPz8%2BPDw8M%2FePLJJz9t%2FGaVF%2Fv27Sv09fW9VyqVegm5iY0xRtvb2ztbWlraDMMgWmv8t20YBmlpaWltbW3dRgihSikIIZBIJAqmaR4sFovvnjlzZjmmrhFAc3PzlwuFwm4pJbTWYIyBEAKl1M1wrYDSWsP3fbiuC6010uk0EonEqkhorQEAUkoIIaCU0plMpjeVSt0H4M8bArh27dqJycnJ15uamp6wbZtFICilIISAc47FxUX4vg%2FDMJBMJgEA5XIZYRjCtm0UCgUYhhGDCMMQYRhq3%2Ff12NjYm%2FV6%2FfgtKRgeHsa99957xjTNrxQKhW2RnFKKer2OxcVFJJNJpNNp2LYNSikopbBtG8lkEoQQVKvVm54ZBqSU4JyDc04mJyeHx8bGfjI4OLjcaHNdGYZhaBFCClHYtdZYXl6G7%2FvIZDIxDWuX1hqUUqTTadTr9SgfIgBQSuXDMFxnb1VG9%2Ff3I5%2FPf6dYLPZIKaGUAuccN27cgGmaq4wppbSUUiuloJRalYi2bcNxHHiehyAIIIRAsVjc0dzc%2FNBaAOTIkSNobW21GWMJzrnZ2dn5h7vuuutrjDEwxuB5XpyQpmmCMaYrlUp9bGzsT6Ojoyds20Z3d%2FcDO3bs%2BG42m20CQKSU8H0fQoibPDMGwzAwPj5%2B%2BsqVK4csywoJIUG5XPaN5ubmwj333HM0m832SCnTpmm2R54opSClBKUUWmsIIXSlUqmPjIz8%2FPz5828fO3ZMAsBjjz32dq1W%2B3DPnj2%2FyeVyWSEEOOeQUsIwDFBKwRhDqVTq6%2B7uvsgYq7uue%2FnSpUuPG4SQ26SU9wshUoyx2HBjyTUCmpycfG9kZCQ2DgBvvfWWpJT%2BPpfL3d%2Fb2%2Ft4EAQR70gmkzCMmHpGKe0QQkAIsV0I0UE5502cc0tKiYj3yPO1AIQQmJ2dPXH06FGJNcs0TTU9Pf2%2B67ox71GFRL2k0Qbn3PQ8r8mI%2FhBCxM1jbXZHEVFKIQxDtVEVtLW1IQgC7XlezLtlWXElNAJoBEIB1IUQPBI0viCEAGMsjgqllNx%2B%2B%2B0PPPPMM%2BvOg0qlQjs6Or4F3OwBlmUhkUis87xBd0gIcQwAV8MwPOn7fg%2BltMm27aJlWQwAOOewbRtBEMRedXV1HaKUnujv7%2F9jtVpVvb29mJmZobt27Xpky5Yt34%2B8JoTAsiwEQRA7E4ahCoJgQSnlcs4vE0Kukueeew75fD6RuNnMza1bt77T3t7%2B9ah0UqkUHMeJAVBKNef8huu673LO39daa9M0H0qlUt9LpVI5rTWJ6Mxms1heXoYQAlJKffXq1TPz8%2FOHAIS%2B7weVSsVb19Zee%2B21x%2B%2B4447XLcuihmHANE0YhoF6vR5XRtR4ovKilMKyLERVxDmHZVloKEfNOdcTExM%2Fe%2Bqpp95otLeOy2q1erxer%2F8zSsDIG9M04XkeXNfF8vIywjCM261lWYgmJEIIMpkMLMuKk5cQQhzHuVyr1f6y1t6q3vzss8%2FCdd2gVquVs9ls3Mk8z4Nt20in03BdN87wyOsILACkUikwxhCGIUzTjI9y13XLrusGawHEp%2BHhw4ehlMLdd9%2F9q46OjkcAUEIIKKUwDAOMMdi2jZaWltiI1hqEEJimiWQyiWQyCa01onmCEBL%2Fbmpqarcsq6W7u%2Fv42bNn1wM4d%2B4cHn744W%2Fu37%2F%2F14wxFnkY7ZVzIA6rZVlIpVKwbRuMsXX13dg%2FVhoZaWtr27u0tHT%2Bo48%2BurxhDnDOL1Qqlb%2Bv8BZtvfYIjnLD9334vh%2F3%2FZWt19b%2BytxAFhcXL7mu%2B8mGFADA6dOnvYMHD36czWa%2FkUgkWimlGoCqVqsfCyGqlmW10oZ5vBHYSg5oKaWq1Wr%2FcBxn3LKs27TWRGtNHMeZmJqaerS%2Fv%2F9ftwQAAHv27Pm3lPJUOp0%2BkEqltszOzr7x%2BeefP1Eul4%2B5rntRKZVJJpNdjDHaCEAIoRYWFv46PT39wtTU1Auzs7O%2FY4zl8%2Fn8lyqVymdTU1OPzs%2FPf3bq1KlV9jYebwAMDg625vP5fTMzMx%2B8%2FPLL8SExMDDQ2tfXd7G9vb2j8f25ublrw8PDu44cORJfQJ5%2B%2BmlSKpUerNVqnzTKG9ct74YDAwNlAO%2BvlQdBEEopl9fmhZTSC4JANMpeffVVDeCDW9kA%2Fo%2B74eLiIvc8bzYMw0ApJbXWMgzDwPO8maWlJb5ZfZu%2BHS8tLXkXLlz44RdffHFbcmUu9zzPu379%2BtVyuexuVt9%2FAKVP%2BiORVHX0AAAAAElFTkSuQmCC); | 59 | background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAACE5JREFUWIWdV2tsHNUV%2Fu6989iHd9frtVeJsUNsEW8AOYSkTUgs9SVKoahSUdpKSC0toBapSEhBVuFPsOxfFInSP6hCgoigVhS1IFVtgKBKaaIoxBFOChF1bceubRI7btbe3cyOZ%2BbOffRHPKP1I63cK11p5%2BzMOd853znnnkuwyTUwMIBSqdTKGOswTTOjtUYYho7jOFcmJibKL7300qb0GZsFQClNbN%2B%2B%2FWhXV9f9ACwA0FrzycnJv83NzR0C4G1K32YBSCltAD25XC6Zy%2BVYLpdjzc3NScZYDyHEbny3v7%2F%2Ff%2BrbMAJDQ0NwXbdg2%2FY%2Bx3E%2BfOWVV3Sk0DAMyzTNNKWrsRuGkWaMWdHz4cOHIaXE4ODgg57njbz44ovXN7JF1gqef%2F55FIvFXXv37n1z586du0%2BePPnG2NjYL0zTNLdu3frtbdu2%2FejOO%2B%2F8ajabZY3fOY4jR0dHT09PT%2F92YWHhuFIq2L179y%2F379%2F%2F04WFhc8uXrz44%2FHx8U%2BHhoZuDWBoaAjpdHrXgQMH3unp6dlJKYXv%2B3J0dHQ4k8nkOzs7S6lU6pa0aa3huq6am5sbD4Jgsaen5z7TNJlSCvPz8%2BPDw8M%2FePLJJz9t%2FGaVF%2Fv27Sv09fW9VyqVegm5iY0xRtvb2ztbWlraDMMgWmv8t20YBmlpaWltbW3dRgihSikIIZBIJAqmaR4sFovvnjlzZjmmrhFAc3PzlwuFwm4pJbTWYIyBEAKl1M1wrYDSWsP3fbiuC6010uk0EonEqkhorQEAUkoIIaCU0plMpjeVSt0H4M8bArh27dqJycnJ15uamp6wbZtFICilIISAc47FxUX4vg%2FDMJBMJgEA5XIZYRjCtm0UCgUYhhGDCMMQYRhq3%2Ff12NjYm%2FV6%2FfgtKRgeHsa99957xjTNrxQKhW2RnFKKer2OxcVFJJNJpNNp2LYNSikopbBtG8lkEoQQVKvVm54ZBqSU4JyDc04mJyeHx8bGfjI4OLjcaHNdGYZhaBFCClHYtdZYXl6G7%2FvIZDIxDWuX1hqUUqTTadTr9SgfIgBQSuXDMFxnb1VG9%2Ff3I5%2FPf6dYLPZIKaGUAuccN27cgGmaq4wppbSUUiuloJRalYi2bcNxHHiehyAIIIRAsVjc0dzc%2FNBaAOTIkSNobW21GWMJzrnZ2dn5h7vuuutrjDEwxuB5XpyQpmmCMaYrlUp9bGzsT6Ojoyds20Z3d%2FcDO3bs%2BG42m20CQKSU8H0fQoibPDMGwzAwPj5%2B%2BsqVK4csywoJIUG5XPaN5ubmwj333HM0m832SCnTpmm2R54opSClBKUUWmsIIXSlUqmPjIz8%2FPz5828fO3ZMAsBjjz32dq1W%2B3DPnj2%2FyeVyWSEEOOeQUsIwDFBKwRhDqVTq6%2B7uvsgYq7uue%2FnSpUuPG4SQ26SU9wshUoyx2HBjyTUCmpycfG9kZCQ2DgBvvfWWpJT%2BPpfL3d%2Fb2%2Ft4EAQR70gmkzCMmHpGKe0QQkAIsV0I0UE5502cc0tKiYj3yPO1AIQQmJ2dPXH06FGJNcs0TTU9Pf2%2B67ox71GFRL2k0Qbn3PQ8r8mI%2FhBCxM1jbXZHEVFKIQxDtVEVtLW1IQgC7XlezLtlWXElNAJoBEIB1IUQPBI0viCEAGMsjgqllNx%2B%2B%2B0PPPPMM%2BvOg0qlQjs6Or4F3OwBlmUhkUis87xBd0gIcQwAV8MwPOn7fg%2BltMm27aJlWQwAOOewbRtBEMRedXV1HaKUnujv7%2F9jtVpVvb29mJmZobt27Xpky5Yt34%2B8JoTAsiwEQRA7E4ahCoJgQSnlcs4vE0Kukueeew75fD6RuNnMza1bt77T3t7%2B9ah0UqkUHMeJAVBKNef8huu673LO39daa9M0H0qlUt9LpVI5rTWJ6Mxms1heXoYQAlJKffXq1TPz8%2FOHAIS%2B7weVSsVb19Zee%2B21x%2B%2B4447XLcuihmHANE0YhoF6vR5XRtR4ovKilMKyLERVxDmHZVloKEfNOdcTExM%2Fe%2Bqpp95otLeOy2q1erxer%2F8zSsDIG9M04XkeXNfF8vIywjCM261lWYgmJEIIMpkMLMuKk5cQQhzHuVyr1f6y1t6q3vzss8%2FCdd2gVquVs9ls3Mk8z4Nt20in03BdN87wyOsILACkUikwxhCGIUzTjI9y13XLrusGawHEp%2BHhw4ehlMLdd9%2F9q46OjkcAUEIIKKUwDAOMMdi2jZaWltiI1hqEEJimiWQyiWQyCa01onmCEBL%2Fbmpqarcsq6W7u%2Fv42bNn1wM4d%2B4cHn744W%2Fu37%2F%2F14wxFnkY7ZVzIA6rZVlIpVKwbRuMsXX13dg%2FVhoZaWtr27u0tHT%2Bo48%2BurxhDnDOL1Qqlb%2Bv8BZtvfYIjnLD9334vh%2F3%2FZWt19b%2BytxAFhcXL7mu%2B8mGFADA6dOnvYMHD36czWa%2FkUgkWimlGoCqVqsfCyGqlmW10oZ5vBHYSg5oKaWq1Wr%2FcBxn3LKs27TWRGtNHMeZmJqaerS%2Fv%2F9ftwQAAHv27Pm3lPJUOp0%2BkEqltszOzr7x%2BeefP1Eul4%2B5rntRKZVJJpNdjDHaCEAIoRYWFv46PT39wtTU1Auzs7O%2FY4zl8%2Fn8lyqVymdTU1OPzs%2FPf3bq1KlV9jYebwAMDg625vP5fTMzMx%2B8%2FPLL8SExMDDQ2tfXd7G9vb2j8f25ublrw8PDu44cORJfQJ5%2B%2BmlSKpUerNVqnzTKG9ct74YDAwNlAO%2BvlQdBEEopl9fmhZTSC4JANMpeffVVDeCDW9kA%2Fo%2B74eLiIvc8bzYMw0ApJbXWMgzDwPO8maWlJb5ZfZu%2BHS8tLXkXLlz44RdffHFbcmUu9zzPu379%2BtVyuexuVt9%2FAKVP%2BiORVHX0AAAAAElFTkSuQmCC); |
60 | } \ No newline at end of file | 60 | } \ No newline at end of file |
diff --git a/js/panels/objects/object.reel/object.html b/js/panels/objects/object.reel/object.html index a072ab5e..6274f480 100644 --- a/js/panels/objects/object.reel/object.html +++ b/js/panels/objects/object.reel/object.html | |||
@@ -14,7 +14,8 @@ | |||
14 | "owner": { | 14 | "owner": { |
15 | "prototype": "js/panels/objects/object.reel", | 15 | "prototype": "js/panels/objects/object.reel", |
16 | "properties": { | 16 | "properties": { |
17 | "element": {"#": "object"} | 17 | "element": {"#": "object"}, |
18 | "iconElement": { "#": "object-icon"} | ||
18 | } | 19 | } |
19 | }, | 20 | }, |
20 | "labelText": { | 21 | "labelText": { |
@@ -39,7 +40,7 @@ | |||
39 | 40 | ||
40 | 41 | ||
41 | <li data-montage-id="object" draggable="true"> | 42 | <li data-montage-id="object" draggable="true"> |
42 | <div class="object-icon"></div> | 43 | <div data-montage-id="object-icon" class="object-icon"></div> |
43 | <span data-montage-id="label" class="object-label"></span> | 44 | <span data-montage-id="label" class="object-label"></span> |
44 | </li> | 45 | </li> |
45 | 46 | ||
diff --git a/js/panels/objects/object.reel/object.js b/js/panels/objects/object.reel/object.js index 1e33b7f7..76f1b5bf 100644 --- a/js/panels/objects/object.reel/object.js +++ b/js/panels/objects/object.reel/object.js | |||
@@ -13,16 +13,8 @@ var Montage = require("montage/core/core").Montage, | |||
13 | 13 | ||
14 | exports.Object = Montage.create(Component, { | 14 | exports.Object = Montage.create(Component, { |
15 | _needsPropertyInspection : { value: null }, | 15 | _needsPropertyInspection : { value: null }, |
16 | type: { value: null }, | 16 | iconElement : { value: null }, |
17 | getType : { | 17 | type : { value: null }, |
18 | value: function() { | ||
19 | if(this._hasPrototype(this.sourceObject, 'Component')) { | ||
20 | return 'Component'; | ||
21 | } | ||
22 | |||
23 | return null; | ||
24 | } | ||
25 | }, | ||
26 | 18 | ||
27 | _sourceObject : { value: null }, | 19 | _sourceObject : { value: null }, |
28 | sourceObject : { | 20 | sourceObject : { |
@@ -36,7 +28,7 @@ exports.Object = Montage.create(Component, { | |||
36 | 28 | ||
37 | if(object._montage_metadata) { | 29 | if(object._montage_metadata) { |
38 | this.montageMetaData = object._montage_metadata; | 30 | this.montageMetaData = object._montage_metadata; |
39 | this.type = this.getType(); | 31 | this.type = this.application.ninja.objectsController.getObjectCategory(object); |
40 | } | 32 | } |
41 | 33 | ||
42 | this._needsPropertyInspection = this.needsDraw = true; | 34 | this._needsPropertyInspection = this.needsDraw = true; |
@@ -83,23 +75,12 @@ exports.Object = Montage.create(Component, { | |||
83 | 75 | ||
84 | }, | 76 | }, |
85 | 77 | ||
86 | _hasPrototype : { | ||
87 | value: function(object, prototypeName) { | ||
88 | var prototypes = this.application.ninja.objectsController.getPrototypes(object).map(function(proto) { | ||
89 | var metadata = proto._montage_metadata; | ||
90 | return (metadata) ? metadata.objectName : "Object"; | ||
91 | }); | ||
92 | |||
93 | return prototypes.indexOf(prototypeName) !== -1; | ||
94 | } | ||
95 | }, | ||
96 | |||
97 | draw : { | 78 | draw : { |
98 | value: function() { | 79 | value: function() { |
99 | if(this.type) { | 80 | if(this.type) { |
100 | this.element.classList.add('object-icon-'+this.type.toLowerCase()); | 81 | this.iconElement.classList.add('object-icon-'+this.type.toLowerCase()); |
101 | } else{ | 82 | } else{ |
102 | this.element.classList.add('object-icon-default'); | 83 | this.iconElement.classList.add('object-icon-default'); |
103 | } | 84 | } |
104 | 85 | ||
105 | 86 | ||