fix #15

jieyou · Feb 28, 2017 · 1519904 · 1519904
1 parent fdfa4d0
commit 1519904
Show file tree

Hide file tree

Showing 38 changed files with 4 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/README.textile b/README.textile
diff --git a/examples/css/appelsiini.css b/examples/css/appelsiini.css
diff --git a/examples/css/font-awesome.min.css b/examples/css/font-awesome.min.css
diff --git a/examples/css/jieyou.css b/examples/css/jieyou.css
diff --git a/examples/disabled.html b/examples/disabled.html
diff --git a/examples/enabled.html b/examples/enabled.html
diff --git a/examples/enabled_ajax.html b/examples/enabled_ajax.html
diff --git a/examples/enabled_amd.html b/examples/enabled_amd.html
diff --git a/examples/enabled_background.html b/examples/enabled_background.html
diff --git a/examples/enabled_container.html b/examples/enabled_container.html
diff --git a/examples/enabled_fadein.html b/examples/enabled_fadein.html
diff --git a/examples/enabled_gazillion.html b/examples/enabled_gazillion.html
diff --git a/examples/enabled_image_full_width.html b/examples/enabled_image_full_width.html
diff --git a/examples/enabled_no_fake_img_loader.html b/examples/enabled_no_fake_img_loader.html
diff --git a/examples/enabled_noscript.html b/examples/enabled_noscript.html
diff --git a/examples/enabled_srcset.html b/examples/enabled_srcset.html
diff --git a/examples/enabled_timeout.html b/examples/enabled_timeout.html
diff --git a/examples/enabled_url_rewriter_fn.html b/examples/enabled_url_rewriter_fn.html
diff --git a/examples/enabled_vertical_only.html b/examples/enabled_vertical_only.html
diff --git a/examples/enabled_wide.html b/examples/enabled_wide.html
diff --git a/examples/enabled_wide_container.html b/examples/enabled_wide_container.html
diff --git a/examples/font/fontawesome-webfont.woff b/examples/font/fontawesome-webfont.woff
diff --git a/examples/img/bmw_m1_hood.jpg b/examples/img/bmw_m1_hood.jpg
diff --git a/examples/img/bmw_m1_hood_rewritten.jpg b/examples/img/bmw_m1_hood_rewritten.jpg
diff --git a/examples/img/bmw_m1_side.jpg b/examples/img/bmw_m1_side.jpg
diff --git a/examples/img/bmw_m3_gt.jpg b/examples/img/bmw_m3_gt.jpg
diff --git a/examples/img/corvette_pitstop.jpg b/examples/img/corvette_pitstop.jpg
diff --git a/examples/img/grey.gif b/examples/img/grey.gif
diff --git a/examples/img/transparent.gif b/examples/img/transparent.gif
diff --git a/examples/img/viper_1.jpg b/examples/img/viper_1.jpg
diff --git a/examples/img/viper_corner.jpg b/examples/img/viper_corner.jpg
diff --git a/examples/img/white.gif b/examples/img/white.gif
diff --git a/examples/page_js/html5shiv.js b/examples/page_js/html5shiv.js
diff --git a/examples/remove_invisible.html b/examples/remove_invisible.html
diff --git a/lazyload.js b/lazyload.js
@@ -176,10 +176,11 @@
             }
 
             $.each(defaultOptions,function(k,v){
+                var typeK = type(options[k])
                 if($.inArray(k,['threshold','failure_limit','check_appear_throttle_time']) != -1){ // these params can be a string
-                    if(type(options[k]) == 'String'){
+                    if(typeK == 'String'){
                         options[k] = parseInt(options[k],10)
-                    }else{
+                    }else if(typeK != 'Number'){
                         options[k] = v
                     }
                 }else if(k == 'container'){ // options.container can be a seletor string \ dom \ jQuery object
@@ -193,7 +194,7 @@
                         options._$container = $window
                     }
                     delete options.container
-                }else if(defaultOptions.hasOwnProperty(k) && (!options.hasOwnProperty(k) || (type(options[k]) != type(defaultOptions[k])))){
+                }else if(defaultOptions.hasOwnProperty(k) && (!options.hasOwnProperty(k) || (typeK != type(defaultOptions[k])))){
                     options[k] = v
                 }
             })

diff --git a/lazyload.min.js b/lazyload.min.js