Merge pull request #96 from Shopify/feature_bump-1-2-1

Bump to 1.2.1

Gemfile.lock

@@ -1,68 +1,71 @@
 PATH
   remote: .
   specs:
-    twine-rails (1.2.0)
+    twine-rails (1.2.1)
       coffee-rails
       railties
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.0.1)
-      actionview (= 5.0.1)
-      activesupport (= 5.0.1)
+    actionpack (5.1.5)
+      actionview (= 5.1.5)
+      activesupport (= 5.1.5)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
-      activesupport (= 5.0.1)
+    actionview (5.1.5)
+      activesupport (= 5.1.5)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activesupport (5.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activesupport (5.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     builder (3.2.3)
-    coffee-rails (4.2.1)
+    coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.2.x)
+      railties (>= 4.0.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.0.4)
-    erubis (2.7.0)
+    concurrent-ruby (1.0.5)
+    crass (1.0.3)
+    erubi (1.7.0)
     execjs (2.7.0)
-    i18n (0.8.0)
-    loofah (2.0.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    method_source (0.8.2)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    nokogiri (1.7.0.1)
-      mini_portile2 (~> 2.1.0)
-    rack (2.0.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
+    method_source (0.9.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    rack (2.0.4)
+    rack-test (0.8.2)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.1)
-      actionpack (= 5.0.1)
-      activesupport (= 5.0.1)
+    railties (5.1.5)
+      actionpack (= 5.1.5)
+      activesupport (= 5.1.5)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
-    thor (0.19.4)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -74,4 +77,4 @@ DEPENDENCIES
   twine-rails!
 
 BUNDLED WITH
-   1.12.5
+   1.16.0

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "twine",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "homepage": "https://github.com/Shopify/twine",
   "authors": [
     "Shopify Inc"

dev.yml

@@ -2,7 +2,7 @@ name: twine
 
 up:
   - node:
-      version: v5.7.0
+      version: v6.11.1
       packages:
         - .
   - ruby:

dist/twine.js

@@ -2,14 +2,16 @@
   var slice = [].slice;
 
   (function(root, factory) {
+    var jQuery;
     if (typeof root.define === 'function' && root.define.amd) {
-      return root.define([], factory);
+      return root.define(['jquery'], factory);
     } else if (typeof module === 'object' && module.exports) {
-      return module.exports = factory();
+      jQuery = typeof window !== 'undefined' ? require('jquery') : require('jquery')(root);
+      return module.exports = factory(jQuery);
     } else {
-      return root.Twine = factory();
+      return root.Twine = factory(root.jQuery);
     }
-  })(this, function() {
+  })(this, function(jQuery) {
     var Twine, arrayPointersForNode, attribute, bind, bindingOrder, currentBindingCallbacks, defineArray, elements, eventName, findOrCreateElementForNode, fireCustomChangeEvent, getContext, getIndexesForElement, getValue, isDataAttribute, isKeypath, j, k, keyWithArrayIndex, keypathForKey, keypathRegex, len, len1, nodeArrayIndexes, nodeCount, preventDefaultForEvent, ref, ref1, refreshCallbacks, refreshElement, refreshQueued, registry, requiresRegistry, rootContext, rootNode, setValue, setupEventBinding, setupPropertyBinding, stringifyNodeAttributes, valuePropertyForNode, wrapFunctionString;
     Twine = {};
     Twine.shouldDiscardEvent = {};