From 630e1fcae228c9927f17c359c098b910be6f9b0d Mon Sep 17 00:00:00 2001 From: Gadi Cohen Date: Mon, 2 Feb 2015 17:51:25 +0200 Subject: [PATCH] v0.1.32; fix direction="X" regression --- .versions | 4 ++-- History.md | 4 ++++ demo-famono/.meteor/versions | 2 +- lib/famous-views.js | 3 ++- package.js | 2 +- tests/famous.js | 1 + 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.versions b/.versions index 4bbcf19..6851489 100644 --- a/.versions +++ b/.versions @@ -10,7 +10,7 @@ ddp@1.0.14 deps@1.0.6 ejson@1.0.5 follower-livedata@1.0.3 -gadicohen:famous-views@0.1.31-pre.3 +gadicohen:famous-views@0.1.32 geojson-utils@1.0.2 html-tools@1.0.3 htmljs@1.0.3 @@ -19,7 +19,7 @@ jag:pince@0.0.5 jquery@1.11.3 json@1.0.2 less@1.0.12 -local-test:gadicohen:famous-views@0.1.31-pre.3 +local-test:gadicohen:famous-views@0.1.32 logging@1.0.6 meteor@1.1.4 minifiers@1.1.3 diff --git a/History.md b/History.md index 48bf3b8..38b2894 100644 --- a/History.md +++ b/History.md @@ -1,5 +1,9 @@ ## vNEXT +## v0.1.32 + +* Bugfix (#famous regression): direction="X" now works again + ## v0.1.31 * Bugfix (#famous regression): Revert back to Blaze.render (for non-Surfaces) diff --git a/demo-famono/.meteor/versions b/demo-famono/.meteor/versions index 383cd86..94c8947 100644 --- a/demo-famono/.meteor/versions +++ b/demo-famono/.meteor/versions @@ -15,7 +15,7 @@ deps@1.0.6 ejson@1.0.5 fastclick@1.0.2 follower-livedata@1.0.3 -gadicohen:famous-views@0.1.31 +gadicohen:famous-views@0.1.32 gadicohen:fview-lagometer@1.0.2 gadicohen:prism@1.0.4 gadicohen:snippets@0.0.5 diff --git a/lib/famous-views.js b/lib/famous-views.js index 6957fa3..ffa9dff 100644 --- a/lib/famous-views.js +++ b/lib/famous-views.js @@ -187,7 +187,8 @@ var optionBlaze = function(string, key, blazeView) { optionString = function(string, key, blazeView) { // special handling based on special key names - if (key === 'direction' && famous.utilities.Utility.Direction[string]) + if (key === 'direction' && + typeof famous.utilities.Utility.Direction[string] !== 'undefined') return famous.utilities.Utility.Direction[string]; if (key === 'id') return string; diff --git a/package.js b/package.js index 5cbecb9..afd8b8a 100644 --- a/package.js +++ b/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "gadicohen:famous-views", summary: 'Blaze Views for Famous; doing Famous Meteor-style', - version: "0.1.31", + version: "0.1.32", git: "https://github.com/gadicc/meteor-famous-views.git" }); diff --git a/tests/famous.js b/tests/famous.js index c79bb8a..06d0aed 100644 --- a/tests/famous.js +++ b/tests/famous.js @@ -58,6 +58,7 @@ Tinytest.addAsync('famous-views - famous.js - direction', function(test, complet var optionView = null; var optionCount = 0; var optionTests = [ + { given: "X", expect: famous.utilities.Utility.Direction.X }, // key name (value 0) { given: "Y", expect: famous.utilities.Utility.Direction.Y }, // key name { given: "1", expect: famous.utilities.Utility.Direction.Y }, // string numeral { given: 1, expect: famous.utilities.Utility.Direction.Y } // number