Merge pull request #53 from chrishumboldt/dev-rocket

Fix to is image method.
chrishumboldt · Jul 26, 2017 · 851f3fb · 851f3fb
2 parents 5717565 + 34028c7
commit 851f3fb
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 # Files to ignore
 test.html
+test.js
+test.ts
diff --git a/.npmignore b/.npmignore
@@ -1,2 +1,4 @@
 // Files to ignore
 test.html
+test.js
+test.ts
diff --git a/build/js/tools.js b/build/js/tools.js
@@ -242,7 +242,7 @@ var Rocket;
         },
         image: function (file, arAllowedTypes) {
             var allowedTypes = (Rocket.is.array(arAllowedTypes)) ? arAllowedTypes : Rocket.defaults.extensions.images;
-            return allowedTypes[file.split('.').pop().toLowerCase()];
+            return (allowedTypes.indexOf(file.split('.').pop().toLowerCase()) > -1);
         },
         integer: function (check) {
             return (Rocket.is.number(check) && (parseFloat(check) === parseInt(check)));

diff --git a/build/ts/tools.ts b/build/ts/tools.ts
@@ -250,7 +250,7 @@ module Rocket {
       },
       image: (file, arAllowedTypes) => {
          let allowedTypes = (is.array(arAllowedTypes)) ? arAllowedTypes : defaults.extensions.images;
-         return allowedTypes[file.split('.').pop().toLowerCase()];
+         return (allowedTypes.indexOf(file.split('.').pop().toLowerCase()) > -1);
       },
       integer: (check) => {
          return (is.number(check) && (parseFloat(check) === parseInt(check)));

diff --git a/js/tools.min.js b/js/tools.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "rocket-tools",
-   "version": "1.14.4",
+   "version": "1.14.5",
    "description": "The Rocket Tools library is a lightweight set of Javascript methods for quicker and easier development.",
    "main": "js/tools.min.js",
    "repository": {

diff --git a/rocket-tools.d.ts b/rocket-tools.d.ts
@@ -249,7 +249,7 @@ declare module MRocket {
       storage: _Storage;
       string: _String;
       time: _Time;
-      Url: _Url;
+      url: _Url;
       button: any;
       flicker: any;
       form: any;