stormfront-rails 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49183b44cda1e773bc1a333c02d32821256b5575
-  data.tar.gz: ff9b74f5e784034429267c63e9b83fbd22ffbff7
+  metadata.gz: 85c523edfe79559af5efd09fb6f403506cbc31be
+  data.tar.gz: 082fbc7dc4f864a0cfc796e1cd57b55be197f0e8
 SHA512:
-  metadata.gz: 3678282aef3a4cb779012a683189e272ab852f9c91d7ae495fd7be6931f965767f2b7e0035681a907aecf011fd6efb6ba4126f239dddc6732eda46370390d80a
-  data.tar.gz: e0d8cc1d01b99386c860fd499ea9345af59b9b5fd66118729ea083c5a4c0616dd713731a620d90001ee7fa7673cd1e03ff94590d6bceadff866dc24b6a537aee
+  metadata.gz: d7644157bc88b652c9c1eabbf43c8d896cc62703df9bab20df258c708e3956d00368c3ab7374bcecee7fa14212cc2a53651069097e70d3e22eea705faa21aa0c
+  data.tar.gz: 708fc598deb38b37013e88842d56416f65ab5dba5d6995bf85ccf21666606927e0bccdf8178e3d3642a0310d505028039cf2874e2450f3ee2e57c31448822a7a

data/lib/stormfront/rails/version.rb

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

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

@@ -368,25 +368,25 @@ Stormfront.Ajax = {
 };
 
 Stormfront.Ajax.RequestReducer = Stormfront.Reducer.extend({
-    getKey: function(event){
+    getKey: function (event) {
         return Stormfront.Ajax.Support.generateKey(event);
     },
-    getEntries: function(store){
+    getEntries: function (store) {
         return store.ajax || (store.ajax = { });
     },
-    getEntry: function(store, event){
+    getEntry: function (store, event) {
         var key = this.getKey(event);
         var entries = this.getEntries(store);
         return entries[key] || (entries[key] = { });
     },
-    updateEntry: function(store, event, state){
+    updateEntry: function (store, event, state) {
         var ajax = this.getEntry(store, event);
         ajax.state = state;
         ajax.request = event.xhr;
         ajax.exception = event.exception;
         return store;
     },
-    dropEntry: function(store, event){
+    dropEntry: function (store, event) {
         var key = this.getKey(event);
         var entries = this.getEntries(store);
         delete entries[key];
@@ -395,56 +395,62 @@ Stormfront.Ajax.RequestReducer = Stormfront.Reducer.extend({
 
 Stormfront.Ajax.Request = Stormfront.Ajax.RequestReducer.extend({
     type: 'NOT:IMPLEMENTED',
-    execute: function(store, event){
-        event.callbacks = { };
-        event.callbacks.context = this;
-        event.callbacks[Stormfront.Ajax.START] = this.onStart;
-        event.callbacks[Stormfront.Ajax.SUCCESS] = this.onSuccess;
-        event.callbacks[Stormfront.Ajax.ERROR] = this.onError;
+    canExecute: function (store, event) {
+        return true;
+    },
+    execute: function (store, event) {
+        if (this.canExecute(store, event)) {
+            event.callbacks = { };
+            event.callbacks.context = this;
+            event.callbacks[Stormfront.Ajax.START] = this.onStart;
+            event.callbacks[Stormfront.Ajax.SUCCESS] = this.onSuccess;
+            event.callbacks[Stormfront.Ajax.ERROR] = this.onError;
 
-        var self = this;
-        function onStart(xhr, settings){
-            _.extend(event, { xhr: xhr });
-            self.dispatch(new Stormfront.Ajax.StartRequest(event));
-        }
-        function onSuccess(data, status, xhr){
-            _.extend(event, {
-                data: data,
-                status: status,
-                xhr: xhr
-            });
-            self.dispatch(new Stormfront.Ajax.SuccessRequest(event));
-        }
-        function onError(xhr, status, exception){
-            _.extend(event, {
-                status: status,
-                xhr: xhr,
-                exception: exception
+            var self = this;
+            function onStart (xhr, settings) {
+                _.extend(event, { xhr: xhr });
+                self.dispatch(new Stormfront.Ajax.StartRequest(event));
+            }
+            function onSuccess (data, status, xhr) {
+                _.extend(event, {
+                    data: data,
+                    status: status,
+                    xhr: xhr
+                });
+                self.dispatch(new Stormfront.Ajax.SuccessRequest(event));
+            }
+            function onError (xhr, status, exception) {
+                _.extend(event, {
+                    status: status,
+                    xhr: xhr,
+                    exception: exception
+                });
+                self.dispatch(new Stormfront.Ajax.ErrorRequest(event));
+            }
+            var request = this.getParameters(store, event);
+            var settings = _.extend(request, {
+                beforeSend: onStart,
+                error: onError,
+                success: onSuccess
             });
-            self.dispatch(new Stormfront.Ajax.ErrorRequest(event));
+            this.updateEntry(store, event, Stormfront.Ajax.PENDING);
+            this.send(settings);
+            return store;
         }
-        var request = this.getParameters(store, event);
-        var settings = _.extend(request, {
-            beforeSend: onStart,
-            error: onError,
-            success: onSuccess
-        });
-        this.updateEntry(store, event, Stormfront.Ajax.PENDING);
-        this.send(settings);
-        return store;
+        return Stormfront.NO_CHANGE;
     },
-    send: function(settings){
+    send: function (settings) {
         // TODO: Remaining Concerns AJAX:
         // TODO:    Aborting similar request
         // TODO:    Avoiding equal request
         $.ajax(settings);
     },
-    getParameters: function(store, event){
+    getParameters: function (store, event) {
         return { url: '', method: 'get', data: {} }
     },
-    onStart: function(store, event) { },
-    onSuccess: function(store, event) { },
-    onError: function(store, event) { }
+    onStart: function (store, event) { },
+    onSuccess: function (store, event) { },
+    onError: function (store, event) { }
 });
 
 Stormfront.Ajax.StartRequest = Stormfront.Ajax.Support.createGenericRequest(Stormfront.Ajax.START);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stormfront-rails
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Chris Gee