Fixed freefocus('cache'). Version 0.10.2

Flamefork · Sep 3, 2015 · 208c6ba · 208c6ba
1 parent c19de3d
commit 208c6ba
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -127,6 +127,7 @@ Hints could be specified using
 
 ## Changelog
 
+- 0.10.2 Fixed `freefocus('cache')`
 - 0.10.1 Removed lots of jQuery calls from code, speedup is imminent
 - 0.10.0 Supported `targets` option to be a function that returns focusable elements instead of using `focusablesSelector` and `focusablesFilter`
 - 0.9.0 Freefocus returns focus target (or self if no target found) instead of self

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-freefocus",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "main": "dist/jquery.freefocus.js",
   "dependencies": {},
   "devDependencies": {

diff --git a/jquery.freefocus.js b/jquery.freefocus.js
@@ -1,6 +1,6 @@
 /*
 
-jQuery.Freefocus 0.10.1
+jQuery.Freefocus 0.10.2
 
 Copyright (c) 2013-2015 Ilia Ablamonov. Licensed under the MIT license.
 
@@ -190,8 +190,8 @@ Copyright (c) 2013-2015 Ilia Ablamonov. Licensed under the MIT license.
     if ($.freefocus.moves[options.move] === null) {
       throw new Error('Unknown move direction "' + options.move + '"');
     }
-    if (!options.targets || !(options.targets instanceof $ || $.isFunction(options.targets))) {
-      throw new Error('Argument targets should be a jQuery object or function');
+    if (!($.isFunction(options.targets) || $.isArray(options.targets) || options.targets.jquery)) {
+      throw new Error('Argument targets should be a function, array, or jQuery object');
     }
 
     if (options.debug) {
@@ -585,9 +585,12 @@ Copyright (c) 2013-2015 Ilia Ablamonov. Licensed under the MIT license.
   function cacheFocusables(options) {
     options = $.extend({}, $.freefocus.cacheOptions, options);
 
-    var targets = options.targets(options);
-    targets.each(function () {
-      getElementBox(this, true, true);
+    var targets = options.targets;
+    if ($.isFunction(targets)) {
+      targets = targets(options);
+    }
+    $.each(targets, function (i, el) {
+      getElementBox(el, true, true);
     });
   }
 

diff --git a/jquery.freefocus.min.js b/jquery.freefocus.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "freefocus",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "FreeFocus",
   "keywords": [
     "jquery-plugin"