Fixes #1

libhide · Nov 8, 2015 · 872c816 · 872c816
1 parent faa7d83
commit 872c816
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 18 deletions.
diff --git a/demo/css/simplebox.css b/demo/css/simplebox.css
diff --git a/demo/js/simplebox.js b/demo/js/simplebox.js
@@ -4,15 +4,15 @@
     $.fn.simplebox = function(options) {
         var settings = $.extend({
             fadeSpeed: 400,
-            imgPath: "img/",
+            imgPath: "img",
             closeImg: "cross.svg",
             closeCrossAnimation: true,
         }, options);
 
         // Helper Variables
         var $body = $("body");
         var $overlay = $('<div id="overlay"></div>');
-        var $cross = $('<img class="cross" src="' + settings.imgPath + settings.closeImg + '">');
+        var $cross = $('<img class="cross" src="' + settings.imgPath + "/" +settings.closeImg + '">');
         var $image = $("<img class='slb'>");
         var fadeSpeed = settings.fadeSpeed;
 
@@ -25,8 +25,7 @@
             } else {
                 $('.cross').hide(settings.fadeSpeed);
             }
-            // $image.addClass('pop-out');
-            // $image.removeClass('pop-in');
+            $image.removeClass('slb-opened');
         });
 
         $cross.click(function() {
@@ -36,8 +35,7 @@
             } else {
                 $('.cross').hide(settings.fadeSpeed);
             }
-            // $image.addClass('pop-out');
-            // $image.removeClass('pop-in');
+            $image.removeClass('slb-opened');
         });
 
         return this.each(function() {
@@ -46,14 +44,14 @@
 
             // When the image is clicked
             $this.click(function() {
-                console.log("Click");
                 var $this = $(this);
                 var imageSRC = $this.attr("src");
                 $image.attr("src", imageSRC);
                 $image.css("max-height", "80%");
                 $image.addClass('pop-in');
                 $image.removeClass('pop-out');
                 $image.addClass('center');
+                $image.addClass('slb-opened');
 
                 $overlay.css('pointer-events', 'initial');
 

diff --git a/dist/css/simplebox.css b/dist/css/simplebox.css
diff --git a/dist/css/simplebox.min.css b/dist/css/simplebox.min.css
diff --git a/dist/js/simplebox.min.js b/dist/js/simplebox.min.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -29,7 +29,6 @@ gulp.task('compileSass', function() {
 
 gulp.task('outputImages', function() {
     return gulp.src("src/img/cross.svg")
-        .pipe(gulp.dest('./demo/img'))
         .pipe(gulp.dest('./dist/img'));
 });
 

diff --git a/src/css/simplebox.scss b/src/css/simplebox.scss
@@ -1,6 +1,11 @@
 .slb {
   box-shadow: 2px 2px 12px 1px rgba(0, 0, 0, 0.2);
-  cursor: pointer;
+  cursor: -webkit-zoom-in;
+  cursor: zoom-in;
+}
+
+.slb-opened {
+  cursor: auto;
 }
 
 .pop-in {

diff --git a/src/js/simplebox.js b/src/js/simplebox.js
@@ -25,8 +25,7 @@
             } else {
                 $('.cross').hide(settings.fadeSpeed);
             }
-            // $image.addClass('pop-out');
-            // $image.removeClass('pop-in');
+            $image.removeClass('slb-opened');
         });
 
         $cross.click(function() {
@@ -36,8 +35,7 @@
             } else {
                 $('.cross').hide(settings.fadeSpeed);
             }
-            // $image.addClass('pop-out');
-            // $image.removeClass('pop-in');
+            $image.removeClass('slb-opened');
         });
 
         return this.each(function() {
@@ -46,14 +44,14 @@
 
             // When the image is clicked
             $this.click(function() {
-                console.log("Click");
                 var $this = $(this);
                 var imageSRC = $this.attr("src");
                 $image.attr("src", imageSRC);
                 $image.css("max-height", "80%");
                 $image.addClass('pop-in');
                 $image.removeClass('pop-out');
                 $image.addClass('center');
+                $image.addClass('slb-opened');
 
                 $overlay.css('pointer-events', 'initial');