FIX: Updating attire when anything changes

gobstones · Feb 8, 2017 · 711306e · 711306e
1 parent b8575ca
commit 711306e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 21 deletions.
diff --git a/dist/components/gs-cell.html b/dist/components/gs-cell.html
@@ -95,10 +95,7 @@
         rowIndex: Number,
         cell: Object,
         table: Array,
-        attire: {
-          type: Object,
-          notify: "_updateStyles"
-        },
+        attire: Object,
         boom: Boolean,
         backgroundUrl: String,
         header: {
@@ -110,10 +107,9 @@
       listeners: {
         click: "_leftClick"
       },
-      observers: ['_updateStyles(attire.enabled)'],
+      observers: ['_updateStyles(table.*, attire.*, rowIndex, cellIndex, boom)'],
       ready: function() {
-        this._validateData();
-        return this._updateStyles();
+        return this._validateData();
       },
       cssClass: function(header) {
         var theHeaderIsHere;
@@ -162,10 +158,13 @@
           throw new Error("The coordinates are required");
         }
       },
-      _updateStyles: function() {
-        var url;
-        url = this.$.dresser.getImage(this.cell, this.attire);
-        this.customStyle["--stones-visibility"] = (url != null) || this.boom ? "hidden" : "visible";
+      _updateStyles: function(_arg, _arg1, rowIndex, cellIndex, boom) {
+        var attire, cell, table, url;
+        table = _arg.base;
+        attire = _arg1.base;
+        cell = table[rowIndex][cellIndex];
+        url = this.$.dresser.getImage(cell, attire);
+        this.customStyle["--stones-visibility"] = (url != null) || boom ? "hidden" : "visible";
         if (url != null) {
           this.customStyle["--background-url"] = "url(" + url + ")";
         } else {

diff --git a/dist/gs-board.html b/dist/gs-board.html
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gs-board",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "dependencies": {},
   "devDependencies": {
     "connect-livereload": "^0.4.0",

diff --git a/src/components/gs-cell/script.coffee b/src/components/gs-cell/script.coffee
@@ -6,9 +6,7 @@ Polymer
     rowIndex: Number
     cell: Object
     table: Array
-    attire:
-      type: Object
-      notify: "_updateStyles"
+    attire: Object
     boom: Boolean
     backgroundUrl: String
     header:
@@ -20,12 +18,11 @@ Polymer
     click: "_leftClick"
 
   observers: [
-    '_updateStyles(attire.enabled)'
+    '_updateStyles(table.*, attire.*, rowIndex, cellIndex, boom)'
   ]
 
   ready: ->
     @_validateData()
-    @_updateStyles()
 
   cssClass: (header) ->
     return "" if not header?
@@ -51,10 +48,11 @@ Polymer
     throw new Error("The cell is required") if not @cell?
     throw new Error("The coordinates are required") if not @cellIndex? or not @rowIndex?
 
-  _updateStyles: ->
-    url = @$.dresser.getImage @cell, @attire
+  _updateStyles: ({ base: table }, { base: attire }, rowIndex, cellIndex, boom) ->
+    cell = table[rowIndex][cellIndex]
+    url = @$.dresser.getImage cell, attire
 
-    @customStyle["--stones-visibility"] = if url? or @boom then "hidden" else "visible"
+    @customStyle["--stones-visibility"] = if url? or boom then "hidden" else "visible"
     if url? then @customStyle["--background-url"] = "url(#{url})"
     else delete @customStyle["--background-url"]