From 0ce97f679daa9680d96c00227297e5eef167d042 Mon Sep 17 00:00:00 2001 From: Richard Monette Date: Thu, 14 Apr 2016 11:45:49 -0400 Subject: [PATCH] bump version to 0.1.6 --- Gemfile.lock | 70 +++++++++++++------------------------- bower.json | 2 +- dist/twine.js | 8 ++--- dist/twine.min.js | 2 +- lib/twine-rails/version.rb | 2 +- package.json | 2 +- 6 files changed, 31 insertions(+), 55 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3cf5327..16cbed4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,70 +1,49 @@ PATH remote: . specs: - twine-rails (0.1.5) + twine-rails (0.1.6) coffee-rails GEM remote: https://rubygems.org/ specs: - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) + actionpack (4.0.2) + activesupport (= 4.0.2) + builder (~> 3.1.0) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activesupport (4.2.6) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - builder (3.2.2) - coffee-rails (4.1.1) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + activesupport (4.0.2) + i18n (~> 0.6, >= 0.6.4) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) + builder (3.1.4) + coffee-rails (4.0.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) + railties (>= 4.0.0, < 5.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.9.1.1) erubis (2.7.0) execjs (2.6.0) i18n (0.7.0) - json (1.8.3) - loofah (2.0.3) - nokogiri (>= 1.5.9) - mini_portile2 (2.0.0) - minitest (5.8.4) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - rack (1.6.4) + minitest (4.7.5) + multi_json (1.11.2) + rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + railties (4.0.2) + actionpack (= 4.0.2) + activesupport (= 4.0.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) thor (0.19.1) thread_safe (0.3.5) - tzinfo (1.2.2) - thread_safe (~> 0.1) + tzinfo (0.3.44) PLATFORMS ruby @@ -73,6 +52,3 @@ DEPENDENCIES bundler rake twine-rails! - -BUNDLED WITH - 1.11.2 diff --git a/bower.json b/bower.json index fc0e4ed..4dd1d07 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "twine", - "version": "0.1.5", + "version": "0.1.6", "homepage": "https://github.com/Shopify/twine", "authors": [ "Shopify Inc" diff --git a/dist/twine.js b/dist/twine.js index 6c693b9..b7b5fc8 100644 --- a/dist/twine.js +++ b/dist/twine.js @@ -301,7 +301,7 @@ stringifyNodeAttributes = function(node) { }; wrapFunctionString = function(code, args, node) { - var e, keypath; + var e, error, keypath; if (isKeypath(code) && (keypath = keypathForKey(code))) { if (keypath[0] === '$root') { return function($context, $root) { @@ -315,8 +315,8 @@ wrapFunctionString = function(code, args, node) { } else { try { return new Function(args, "with($context) { return " + code + " }"); - } catch (_error) { - e = _error; + } catch (error) { + e = error; throw "Twine error: Unable to create function on " + node.nodeName + " node with attributes " + (stringifyNodeAttributes(node)); } } @@ -526,7 +526,7 @@ setupEventBinding = function(eventName) { }; }; -ref1 = ['click', 'dblclick', 'mouseenter', 'mouseleave', 'mouseover', 'mouseout', 'mousedown', 'mouseup', 'submit', 'dragenter', 'dragleave', 'dragover', 'drop', 'drag', 'change', 'keypress', 'keydown', 'keyup', 'input', 'error', 'done', 'success', 'fail', 'blur', 'focus', 'load']; +ref1 = ['click', 'dblclick', 'mouseenter', 'mouseleave', 'mouseover', 'mouseout', 'mousedown', 'mouseup', 'submit', 'dragenter', 'dragleave', 'dragover', 'drop', 'drag', 'change', 'keypress', 'keydown', 'keyup', 'input', 'error', 'done', 'success', 'fail', 'blur', 'focus', 'load', 'paste']; for (k = 0, len1 = ref1.length; k < len1; k++) { eventName = ref1[k]; setupEventBinding(eventName); diff --git a/dist/twine.min.js b/dist/twine.min.js index 2fa9fac..1baf666 100644 --- a/dist/twine.min.js +++ b/dist/twine.min.js @@ -1 +1 @@ -(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o