Merge pull request #27 from storypioneers/develop

Merge 1.4.2

PLUGIN_INFO.md

@@ -25,15 +25,17 @@ If you are an advanced user and know your way around Git and you already use Git
 
 ```bash
 $ cd your/project/root
-$ git submodule add git@github.com:storypioneers/kirby-selector.git site/fields/selector
+$ git submodule add https://github.com/storypioneers/kirby-selector.git site/fields/selector
 ```
 
-Updating all your Git submodules (eg. the Kirby core modules and any extensions added as submodules) to their latest version, all you need to do is to run these two Git commands.
+Updating all your Git submodules (eg. the Kirby core modules and any extensions added as submodules) to their latest version, all you need to do is to run these few Git commands:
 
 ```bash
 $ cd your/project/root
-$ git submodule foreach --recursive git checkout master
-$ git submodule foreach --recursive git pull
+$ git submodule foreach git checkout master
+$ git submodule foreach git pull
+$ git commit -a -m "Update submodules"
+$ git submodule update --init --recursive
 ```
 
 ## Usage

README.md

@@ -33,15 +33,17 @@ If you are an advanced user and know your way around Git and you already use Git
 
 ```bash
 $ cd your/project/root
-$ git submodule add git@github.com:storypioneers/kirby-selector.git site/fields/selector
+$ git submodule add https://github.com/storypioneers/kirby-selector.git site/fields/selector
 ```
 
-Updating all your Git submodules (eg. the Kirby core modules and any extensions added as submodules) to their latest version, all you need to do is to run these two Git commands.
+Updating all your Git submodules (eg. the Kirby core modules and any extensions added as submodules) to their latest version, all you need to do is to run these few Git commands:
 
 ```bash
 $ cd your/project/root
-$ git submodule foreach --recursive git checkout master
-$ git submodule foreach --recursive git pull
+$ git submodule foreach git checkout master
+$ git submodule foreach git pull
+$ git commit -a -m "Update submodules"
+$ git submodule update --init --recursive
 ```
 
 ## Usage

assets/js/selector.js

@@ -57,10 +57,12 @@ Selector = (function($, $field) {
         var height = self.size * self.$items.first().height() + (self.size - 1) + 4;
 
         // Apply height and overflow styles to box
-        self.$field.find('.input-with-items').css({
-            maxHeight: height,
-            overflowY: 'scroll'
-        });
+        if (self.$items.length > 0) {
+            self.$field.find('.input-with-items').css({
+                maxHeight: height,
+                overflowY: 'scroll'
+            });
+        }
     };
 
     /**

selector.php

@@ -4,7 +4,7 @@
  * Selector
  * Kirby Fileselect Field for Kirby 2
  *
- * @version   1.4.1
+ * @version   1.4.2
  * @author    Jonas Döbertin <[email protected]>
  *            for digital storytelling pioneers <[email protected]>
  * @copyright digital storytelling pioneers <[email protected]>
@@ -334,7 +334,7 @@ public function files()
 
         $files = $files->sortBy($this->sort, ($this->flip) ? 'desc' : 'asc')
             ->filter(function ($file) use ($field) {
-                return $field->includeAllFiles() or in_array($file->type(), $field->types);
+                return $field->includeAllFiles() or in_array($file->type(), $field->types());
             });
 
         /**
@@ -410,4 +410,20 @@ public function isRegExp($string)
     {
         return !(@preg_match($string, null) === false);
     }
+
+    /**
+     * Return type filter array.
+     *
+     * FIX: This function is required since we create a new variable containing
+     * a reference to `$this` to overcome the unavailability of `$this within
+     * closures in PHP < 5.4.0 by passing this new reference with the "use"
+     * language construct in the `files()` function.
+     *
+     * @since  1.4.2
+     * @return array
+     */
+    public function types()
+    {
+        return $this->types;
+    }
 }