Skip to content

Commit

Permalink
Merge pull request #65 from Shopify/0.1.6
Browse files Browse the repository at this point in the history
bump version to 0.1.6
  • Loading branch information
richardmonette committed Apr 14, 2016
2 parents 647be0d + 0ce97f6 commit a7bf78d
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 55 deletions.
70 changes: 23 additions & 47 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -73,6 +52,3 @@ DEPENDENCIES
bundler
rake
twine-rails!

BUNDLED WITH
1.11.2
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "twine",
"version": "0.1.5",
"version": "0.1.6",
"homepage": "https://github.com/Shopify/twine",
"authors": [
"Shopify Inc"
Expand Down
8 changes: 4 additions & 4 deletions dist/twine.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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));
}
}
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion dist/twine.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/twine-rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module TwineRails
VERSION = '0.1.5'
VERSION = '0.1.6'
end
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "twine",
"version": "0.1.5",
"version": "0.1.6",
"description": "A minimalistic 2-way binding system",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit a7bf78d

Please sign in to comment.