mumuki-gobstones-runner 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cac300fd1a47b04646788843ddfecc79ff2884ded1f0fe5c487aa6be7a956847
-  data.tar.gz: '0483fa63493e187c1d7c11cc78f19d58a524bb11aa60180c6650e1c3b8848cf8'
+  metadata.gz: b446a18e6b30e8cf36967b04bb4acb42ece4e58f6d408c6c46d4c0169916e1bd
+  data.tar.gz: f3da67c858453ebe4cd67b296411ad8c2c8464e7555f4aa77dfc2e6fc89ef791
 SHA512:
-  metadata.gz: 4f504c3eac9f541416c2357ed1cd8da5adceb3ae4f24381cd3ecd473eae613d9742f8c5044c7e26c21230af9eab9b9a1ca46db761f91423d673142f62be604bd
-  data.tar.gz: ea1bd21dc36faedcfe18c49ec6d90e5953654b55d1c2433c4de8a55076660a1db33b0107701db85ef13ba6768c29ac7cd35f2f3fd9218b2bf50bae32cdbf9465
+  metadata.gz: 7ea507680416d06c0f23b3223ce8c32f331bb55a46492ed14f5dad0e69f610743d257df6363ea0a68767bf0cc12f78f33970ee70a0fe84214f6697a321d66984
+  data.tar.gz: 8fcf765ac567ac38e0edcce528de4fdecbcc47b471297b8b59d5ef316ee1a27707370091494c531a8ea459b5922886be863f5f53e68ace1951a4b28bb464e11e

data/lib/assets_server.rb

@@ -13,6 +13,10 @@ class Mumukit::Server::App < Sinatra::Base
     get_asset route, Gobstones::CodeRunner.assets_path_for(path), type
   end
 
+  def self.get_local_svg(name, asset_type)
+    get_local_asset "#{asset_type}/#{name}.svg", "lib/public/#{name}.svg", 'image/svg+xml'
+  end
+
   ['polymer', 'polymer-mini', 'polymer-micro'].each { |name|
     get_board_asset "#{name}.html", "htmls/vendor/#{name}.html", 'text/html'
   }
@@ -28,7 +32,12 @@ class Mumukit::Server::App < Sinatra::Base
   get_local_asset 'editor/editor.html', 'lib/render/editor/editor.html', 'text/html'
   get_local_asset 'editor/hammer.min.js', 'lib/render/editor/hammer.min.js', 'application/javascript'
   get_local_asset 'boom.png', 'lib/public/boom.png', 'image/png'
-  ['red', 'blue', 'green', 'black', 'attires_enabled', 'attires_disabled'].each { |name|
-    get_local_asset "editor/#{name}.svg", "lib/public/#{name}.svg", 'image/svg+xml'
-  }
+
+  ['red', 'blue', 'green', 'black'].each do |name|
+    get_local_svg(name, 'editor')
+  end
+
+  ['attires_enabled', 'attires_disabled'].each do |name|
+    get_local_svg(name, 'layout')
+  end
 end

data/lib/render/boards.html.erb

@@ -48,6 +48,7 @@
     </div>
   <% end %>
 
+  <gs-attire-toggle-button></gs-attire-toggle-button>
 </div>
 
 <% if @result[:reason] %>

data/lib/render/editor/editor.html

@@ -1066,81 +1066,3 @@
   </script>
 </dom-module>
 
-<dom-module id="gs-attire-toggle-button">
-  <style>
-    .button {
-      position: absolute;
-      cursor: pointer;
-      top: -2px;
-      right: 0;
-      -ms-transform-origin: right center;
-      -webkit-transform-origin: right center;
-      transform-origin: right center;
-    }
-  </style>
-
-  <template>
-    <template is="dom-if" if="{{shouldDisplay}}">
-      <div class="button" on-click="_onButtonClick">
-        <template is="dom-if" if="{{isEnabled}}">
-          <img src="./attires_enabled.svg">
-        </template>
-        <template is="dom-if" if="{{!isEnabled}}">
-          <img src="./attires_disabled.svg">
-        </template>
-      </div>
-    </template>
-  </template>
-
-  <script>
-    Polymer({
-      is: 'gs-attire-toggle-button',
-      properties: {
-        isEnabled: {
-          type: Boolean,
-          value: true
-        }
-      },
-
-      ready: function () {
-        document.addEventListener('board-attire-changed', this._updateVisibility.bind(this));
-        this._relocateButton();
-      },
-
-      _updateVisibility: function () {
-        this.boards = $(".mu-kids-states").find("gs-board");
-        this.shouldDisplay = this.boards.toArray().some(board => board.attire);
-      },
-
-      _onButtonClick: function () {
-        this.isEnabled = !this.isEnabled;
-
-        this.boards.each((__, board) => {
-          if (board.attire) board.set("attire.enabled", this.isEnabled);
-          gbsBoardRemoveBorder(board);
-        });
-      },
-
-      _getEditor: function () {
-        return $("mu-gobstones-custom-editor")[0];
-      },
-
-      _relocateButton: function () {
-        const $container = $('.mu-kids-gbs-board-initial');
-        if(!$container.length || this._getEditor().interactiveMode) return;
-        const $header = $('.mu-initial-state-header');
-        const headerWidth = $header.width() || $container.width();
-        const $attireToggle = $container.find('.button.gs-attire-toggle-button');
-        if(!$attireToggle.length) return setTimeout(() => this._relocateButton());
-        const margin = 4; // Leave a margin between text and image
-        const maxSize = 65.75; // Original width
-        mumuki.resize(() => {
-          $attireToggle.css('transform', 'scale(1)');
-          let buttonSize = (($container.width() - headerWidth) / 2) - margin;
-          let scaleX = Math.min(buttonSize, maxSize) / $attireToggle.width();
-          $attireToggle.css('transform', `scale(${scaleX})`);
-        });
-      },
-    });
-  </script>
-</dom-module>

data/lib/render/layout/layout.html

@@ -22,4 +22,88 @@
   </script>
 </dom-module>
 
+<dom-module id="gs-attire-toggle-button">
+  <style>
+    :host-context(.mu-kids-states) .button {
+      position: absolute;
+      cursor: pointer;
+      top: -2px;
+      right: 0;
+      -ms-transform-origin: right center;
+      -webkit-transform-origin: right center;
+      transform-origin: right center;
+    }
+
+    :host-context(.boards-container) .button {
+      cursor: pointer;
+      margin-top: -8px;
+    }
+  </style>
+
+  <template>
+    <template is="dom-if" if="{{shouldDisplay}}">
+      <div class="button" on-click="_onButtonClick">
+        <template is="dom-if" if="{{isEnabled}}">
+          <img src="./attires_enabled.svg">
+        </template>
+        <template is="dom-if" if="{{!isEnabled}}">
+          <img src="./attires_disabled.svg">
+        </template>
+      </div>
+    </template>
+  </template>
+
+  <script>
+    Polymer({
+      is: 'gs-attire-toggle-button',
+      properties: {
+        isEnabled: {
+          type: Boolean,
+          value: true
+        }
+      },
+
+      ready: function () {
+        this._updateVisibility();
+        document.addEventListener('board-attire-changed', this._updateVisibility.bind(this));
+        this._relocateButton();
+      },
+
+      _updateVisibility: function () {
+        this.boards = $(this).parents(".mu-kids-states, .boards-container").find("gs-board");
+        this.shouldDisplay = this.boards.toArray().some(board => board.attire);
+      },
+
+      _onButtonClick: function () {
+        this.isEnabled = !this.isEnabled;
+
+        this.boards.each((__, board) => {
+          if (board.attire) board.set("attire.enabled", this.isEnabled);
+          board.updateStyles();
+        });
+      },
+
+      _getEditor: function () {
+        return $("mu-gobstones-custom-editor")[0];
+      },
+
+      _relocateButton: function () {
+        const $container = $('.mu-kids-gbs-board-initial');
+        if(!$container.length || this._getEditor().interactiveMode) return;
+        const $header = $('.mu-initial-state-header');
+        const headerWidth = $header.width() || $container.width();
+        const $attireToggle = $container.find('.button.gs-attire-toggle-button');
+        if(!$attireToggle.length) return setTimeout(() => this._relocateButton());
+        const margin = 4; // Leave a margin between text and image
+        const maxSize = 65.75; // Original width
+        mumuki.resize(() => {
+          $attireToggle.css('transform', 'scale(1)');
+          let buttonSize = (($container.width() - headerWidth) / 2) - margin;
+          let scaleX = Math.min(buttonSize, maxSize) / $attireToggle.width();
+          $attireToggle.css('transform', `scale(${scaleX})`);
+        });
+      },
+    });
+  </script>
+</dom-module>
 

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module GobstonesVersionHook
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: gobstones-blockly
   requirement: !ruby/object:Gem::Requirement