stormfront-rails 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b73e7b3e4fd4b68c98e4573cb5240ba1e7ebbfa
-  data.tar.gz: 84b85e17d6880fc66afaaf84434a3d424fc5218e
+  metadata.gz: 49183b44cda1e773bc1a333c02d32821256b5575
+  data.tar.gz: ff9b74f5e784034429267c63e9b83fbd22ffbff7
 SHA512:
-  metadata.gz: bc5ec05778baeace7a1d200b2d4aa75900c29e57fc6f7cac4073a35b6314a9859f524d49714df8338dee95368f8fbcb10829792b8a2196ad66be71caf6df1450
-  data.tar.gz: bc58bcdf532db396360514ebd77cbc33bfb39727709a5aac8ff71932e7495c3e873d49033c63f061904459d30dd550bb4596828e044e684a2460a9551b5b192b
+  metadata.gz: 3678282aef3a4cb779012a683189e272ab852f9c91d7ae495fd7be6931f965767f2b7e0035681a907aecf011fd6efb6ba4126f239dddc6732eda46370390d80a
+  data.tar.gz: e0d8cc1d01b99386c860fd499ea9345af59b9b5fd66118729ea083c5a4c0616dd713731a620d90001ee7fa7673cd1e03ff94590d6bceadff866dc24b6a537aee

data/lib/stormfront/rails/version.rb

@@ -1,5 +1,5 @@
 module Stormfront
   module Rails
-    VERSION = '0.10.3'
+    VERSION = '0.10.4'
   end
 end

data/vendor/assets/javascripts/src/stormfront.js

@@ -266,16 +266,20 @@ Stormfront.Time = Stormfront.Class.extend({
 
 
 
-stormfront.type = function(name){
-    return (new Stormfront.Type(name)).get();
+stormfront.type = function(type){
+    return (new Stormfront.Type(type)).get();
 };
 Stormfront.Type = Stormfront.Class.extend({
     initialize: function (name) {
         this.name = name;
     },
     get: function () {
-        var name = this.name.split('.');
-        return stormfront.hash(window).findNestedValue(name);
+        if (_.isString(this.name)) {
+            var name = this.name.split('.');
+            return stormfront.hash(window).findNestedValue(name);
+        } else {
+            return this.name;
+        }
     }
 });
 
@@ -293,6 +297,7 @@ Stormfront.Patterns = {
     Events: function (subject) {
         if (!subject.listenTo)
             $.extend(subject, Backbone.Events);
+
         $.extend(subject, {
             forward: function (other, type) {
                 function propagate(){
@@ -463,14 +468,14 @@ Stormfront.Store = Stormfront.Class.extend({
         this._state = new Stormfront.Store.State();
         this._reducers = new Stormfront.Store.Reducers(options);
     },
-    executeAction: function (action) {
+    executeReducer: function (action) {
         var reducer = this._reducers.find(action);
         if (reducer)
-            this.executeDispatch(action, reducer);
+            this.tryExecuteReducer(action, reducer);
         else
             this.trigger(Stormfront.Dispatches.MISSING, action, reducer);
     },
-    executeDispatch: function (action, reducer) {
+    tryExecuteReducer: function (action, reducer) {
         try {
             this.executeExternalCode(action, reducer);
         } catch (e) {
@@ -594,7 +599,7 @@ Stormfront.Container = Stormfront.Class.extend({
         });
 
         function executeAction(action){
-            store.executeAction(action);
+            store.executeReducer(action);
         }
         function updateView(action, reducer, newProperties, oldProperties){
             page.updateProperties(newProperties, oldProperties, action, reducer);
@@ -1302,7 +1307,7 @@ Homefront.Chaperone = Homefront.View.extend({
         updating: function (properties) {
             this.updateChildren(this._children, properties);
         },
-        attached: function(){
+        attached: function () {
             var previous = this._children;
             this._children = [];
             this.createChildren();
@@ -1315,15 +1320,14 @@ Homefront.Chaperone = Homefront.View.extend({
             this._children = [];
         },
         chaperone: {
-            create: function (type, properties) {
-                type = _.isString(type) ? stormfront.type(type) : type;
+            create: function (child, properties) {
+                var type = stormfront.type(child);
                 properties = _.isObject(properties) ? properties : this.properties;
-                if (type) {
-                    var child = new type(this.getDispatcher());
-                    this.transition('chaperone:add', child, properties);
-                } else {
-                    console.error('Child type does not exist: ', type);
-                }
+
+                if (type)
+                    this.transition('chaperone:add', new type(this.getDispatcher()), properties);
+                else
+                    console.error('Child type does not exist: ', child);
             },
             add: function (child, properties) {
                 this._children.push(child);
@@ -1362,6 +1366,7 @@ Homefront.Chaperone = Homefront.View.extend({
             else
                 this.attachChild(child, this.$el, 'append');
         }
+
         _.each(children, attachChild, this);
     },
     updateChildren: function (children, properties) {
@@ -1371,6 +1376,7 @@ Homefront.Chaperone = Homefront.View.extend({
         function stop(child) {
             this.stopListening(child);
         }
+
         //TODO: This bit is odd...
         _.each(children, stop, this);
         _.invoke(children, 'close');
@@ -1461,27 +1467,29 @@ Homefront.Enumerator = Homefront.Chaperone.extend({
     item: null,
     when: {
         chaperone: {
-            add: function(child){
+            add: function (child) {
                 child.location = this.item.location;
             }
         }
     },
     createChildren: function () {
-        var items = this.selectItems(this.properties);
         function createChild(item) {
             this.createChild(this.item.view, item);
         }
-        _.each(items, createChild, this);
+
+        _.each(this.selectItems(this.properties), createChild, this);
     },
-    updateChildren: function(children, properties){
-        var items = this.selectItems(properties);
-        function updateChild(child, index) {
-            var item = items[index];
-            child.updateProperties(item);
+    updateChildren: function (children, properties) {
+        function updateWith(items) {
+            return function(child, index) {
+                var item = items[index];
+                child.updateProperties(item);
+            }
         }
-        _.each(children, updateChild);
+
+        _.each(children, updateWith(this.selectItems(properties)));
     },
-    composeChild: function(item){
+    composeChild: function (item) {
         return this.createChild(this.item, item);
     },
     selectItems: function (properties) {
@@ -1760,10 +1768,10 @@ Homefront.Select = Homefront.Input.extend({
         return properties.options;
     },
     getValue: function(properties) {
-        return properties.selected;
+        return this.selected || properties.selected;
     },
     select: function(){
-        this.transition('change', this.$el.val());
+        this.transition('change', this.readValue());
     }
 });
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stormfront-rails
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Chris Gee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-jquery-rails