Merge branch 'master' of git@github.com:aino/galleria

cranberyxl · Jul 10, 2010 · 30e4d86 · 30e4d86
2 parents edd85a7 + 3a98f26
commit 30e4d86
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/docs/options.rst b/docs/options.rst
@@ -32,6 +32,7 @@ Table of contents (in alphabetical order)
 - image_margin
 - keep_source
 - max_scale_ratio
+- min_scale_ratio
 - on_image
 - popup_links
 - preload
@@ -300,6 +301,16 @@ Sets the maximum scale ratio for images. F.ex, if you don't want Galleria to ups
 
 *****
 
+min_scale_ratio
+----------
+
+    | type: **Number**
+    | default: **undefined**
+
+Sets the minimum scale ratio for images.
+
+*****
+
 on_image(image, thumbnail)
 ----------
 

diff --git a/src/galleria.js b/src/galleria.js
@@ -1005,7 +1005,7 @@ var G = window.Galleria = Base.extend({
         }
         rewind = typeof rewind != 'undefined' ? !!rewind : index < this.active;
         history = history || false;
-        index = parseInt(index);
+        index = Math.max(0, Math.min(parseInt(index), this.data.length - 1));
         if (!history && G.History) {
             G.History.value(index.toString());
             return;