flight-for-rails 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 741af4a16bd9eb02367c0cfa895e910b2bd73f4d
-  data.tar.gz: 82fd4ccea64d9c8d5852a0114bbdc27999dfa34c
+  metadata.gz: 6e9f106b2d07829bdecb6ad4fd43f0162dcb8f8b
+  data.tar.gz: 98e6e0b82bec8458e79d452d5b32da47fdb3e2d8
 SHA512:
-  metadata.gz: 5ee9aabe9012316d7222f53e8f6d559c5da63440aee3ed252249c549a0f54987f03bca2aa90c13f7bb5f3b2aec3d292017379c2fb54faa0b8496bb6373a1c584
-  data.tar.gz: 68920a92c5a039d0a8cadf6cfba11ebfcbe9d38a6d098fdff05ed26db6a9b6e21c538076b75a20d118b7f99a8d5a5ba0eab4b6d4b68f4c258d4a9ae8964b34d4
+  metadata.gz: a86ba4fad82252740774f69464016388356f4a47e57966cadcb198a519b6f756154cd2b73bb2592e5d568ebee86f7cbf365eaf090c6a7fde0aaa1cc0d6777a13
+  data.tar.gz: 7594e7fee7b1d11a9ff05ada1b52da8b3122269d8c1f9c9069739c08a370ecfbb7ae34950cb5729356529980a1e9fe95ba1d7c009e19a4e644e6c6a2e14431a7

data/README.md

@@ -16,7 +16,7 @@ This gem vendors Flight files and dependecies for Rails assets pipeline.
 First add the following lines to your application `Gemfile`:
 
 ``` ruby
-gem 'flight-for-rails', '~> 1.1.1'
+gem 'flight-for-rails', '~> 1.1.2'
 ```
 
 Then run `bundle install` to update your's gems bundle.

data/lib/flight-for-rails/version.rb

@@ -1,3 +1,3 @@
 module FlightForRails
-	VERSION = '1.1.1'
+	VERSION = '1.1.2'
 end

data/vendor/assets/javascripts/flight/standalone.js

@@ -1,4 +1,4 @@
-/*! Flight v1.1.1 | (c) Twitter, Inc. | MIT License */
+/*! Flight v1.1.2 | (c) Twitter, Inc. | MIT License */
 (function(context) {
   var factories = {}, loaded = {};
   var isArray = Array.isArray || function(obj) {
@@ -196,7 +196,7 @@ define('lib/utils', [], function () {
                 return function (e, data) {
                     var target = $(e.target), parent;
                     Object.keys(rules).forEach(function (selector) {
-                        if ((parent = target.closest(selector)).length) {
+                        if (!e.isPropagationStopped() && (parent = target.closest(selector)).length) {
                             data = data || {};
                             data.el = parent[0];
                             return rules[selector].apply(this, [
@@ -206,6 +206,17 @@ define('lib/utils', [], function () {
                         }
                     }, this);
                 };
+            },
+            once: function (func) {
+                var ran, result;
+                return function () {
+                    if (ran) {
+                        return result;
+                    }
+                    result = func.apply(this, arguments);
+                    ran = true;
+                    return result;
+                };
             }
         };
     return utils;
@@ -217,9 +228,9 @@ define('lib/utils', [], function () {
 // ==========================================
 define('lib/debug', [], function () {
     'use strict';
-    //******************************************************************************************
+    // ==========================================
     // Search object model
-    //******************************************************************************************
+    // ==========================================
     function traverse(util, searchTerm, options) {
         options = options || {};
         var obj = options.obj || window;
@@ -294,9 +305,9 @@ define('lib/debug', [], function () {
     function custom(fn, options) {
         traverse(fn, null, options);
     }
-    //******************************************************************************************
+    // ==========================================
     // Event logging
-    //******************************************************************************************
+    // ==========================================
     var ALL = 'all';
     //no filter
     //no logging by default
@@ -755,13 +766,11 @@ define('lib/base', [
             }
             callback = originalCb.bind(this);
             callback.target = originalCb;
-            // if the original callback is already branded by jQuery's guid, copy it to the context-bound version
-            if (originalCb.guid) {
-                callback.guid = originalCb.guid;
-            }
+            callback.context = this;
             $element.on(type, callback);
-            // get jquery's guid from our bound fn, so unbinding will work
-            originalCb.guid = callback.guid;
+            // store every bound version of the callback
+            originalCb.bound || (originalCb.bound = []);
+            originalCb.bound.push(callback);
             return callback;
         };
         this.off = function () {
@@ -778,6 +787,16 @@ define('lib/base', [
                 $element = this.$node;
                 type = arguments[0];
             }
+            if (callback) {
+                //set callback to version bound against this instance
+                callback.bound && callback.bound.some(function (fn, i, arr) {
+                    if (fn.context && this.identity == fn.context.identity) {
+                        arr.splice(i, 1);
+                        callback = fn;
+                        return true;
+                    }
+                }, this);
+            }
             return $element.off(type, callback);
         };
         this.resolveDelegateRules = function (ruleInfo) {
@@ -854,35 +873,41 @@ define('lib/logger', ['./utils'], function (utils) {
         ].join(result) : result;
     }
     function log(action, component, eventArgs) {
-        var name, elem, fn, logFilter, toRegExp, actionLoggable, nameLoggable;
+        if (!window.DEBUG || !window.DEBUG.enabled)
+            return;
+        var name, eventType, elem, fn, logFilter, toRegExp, actionLoggable, nameLoggable;
         if (typeof eventArgs[eventArgs.length - 1] == 'function') {
             fn = eventArgs.pop();
             fn = fn.unbound || fn;    // use unbound version if any (better info)
         }
-        if (typeof eventArgs[eventArgs.length - 1] == 'object') {
-            eventArgs.pop();    // trigger data arg - not logged right now
-        }
-        if (eventArgs.length == 2) {
-            elem = eventArgs[0];
-            name = eventArgs[1];
-        } else {
+        if (eventArgs.length == 1) {
             elem = component.$node[0];
-            name = eventArgs[0];
-        }
-        if (window.DEBUG && window.DEBUG.enabled) {
-            logFilter = DEBUG.events.logFilter;
-            // no regex for you, actions...
-            actionLoggable = logFilter.actions == 'all' || logFilter.actions.indexOf(action) > -1;
-            // event name filter allow wildcards or regex...
-            toRegExp = function (expr) {
-                return expr.test ? expr : new RegExp('^' + expr.replace(/\*/g, '.*') + '$');
-            };
-            nameLoggable = logFilter.eventNames == 'all' || logFilter.eventNames.some(function (e) {
-                return toRegExp(e).test(name);
-            });
-            if (actionLoggable && nameLoggable) {
-                console.info(actionSymbols[action], action, '[' + name + ']', elemToString(elem), component.constructor.describe.split(' ').slice(0, 3).join(' '));
+            eventType = eventArgs[0];
+        } else if (eventArgs.length == 2) {
+            if (typeof eventArgs[1] == 'object' && !eventArgs[1].type) {
+                elem = component.$node[0];
+                eventType = eventArgs[0];
+            } else {
+                elem = eventArgs[0];
+                eventType = eventArgs[1];
             }
+        } else {
+            elem = eventArgs[0];
+            eventType = eventArgs[1];
+        }
+        name = typeof eventType == 'object' ? eventType.type : eventType;
+        logFilter = DEBUG.events.logFilter;
+        // no regex for you, actions...
+        actionLoggable = logFilter.actions == 'all' || logFilter.actions.indexOf(action) > -1;
+        // event name filter allow wildcards or regex...
+        toRegExp = function (expr) {
+            return expr.test ? expr : new RegExp('^' + expr.replace(/\*/g, '.*') + '$');
+        };
+        nameLoggable = logFilter.eventNames == 'all' || logFilter.eventNames.some(function (e) {
+            return toRegExp(e).test(name);
+        });
+        if (actionLoggable && nameLoggable) {
+            console.info(actionSymbols[action], action, '[' + name + ']', elemToString(elem), component.constructor.describe.split(' ').slice(0, 3).join(' '));
         }
     }
     function withLogging() {
@@ -919,7 +944,11 @@ define('lib/component', [
         var componentInfo = registry.findComponentInfo(this);
         componentInfo && Object.keys(componentInfo.instances).forEach(function (k) {
             var info = componentInfo.instances[k];
-            info.instance.teardown();
+            // It's possible that a previous teardown caused another component to teardown,
+            // so we can't assume that the instances object is as it was.
+            if (info && info.instance) {
+                info.instance.teardown();
+            }
         });
     }
     function checkSerializable(type, data) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flight-for-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Sergey Rezvanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Flight javascript framework for Rails assets pipeline