fixed: scroll bug EN-2 xbsoftware#107 xbsoftware#96 xbsoftware#82

fixed scroll bugs reported in issues xbsoftware#107 xbsoftware#96 xbsoftware#82

Author: AndVikVin

Gruntfile.js

@@ -1,19 +1,10 @@
 module.exports = function(grunt){
     grunt.initConfig({
-        pkg: grunt.file.readJSON('bower.json'),
-        concat:{
-            options: {
-                separator: ';'
-            },
-            dist:{
-                src:['src/*.js', 'lib/kineticjs/kinetic.min.js', 'lib/jquery.scrollTo/jquery.scrollTo.min.js'],
-                dest: '<%= pkg.name %>.js'
-            }
-        },
+        pkg: grunt.file.readJSON('package.json'),
         uglify: {
             main: {
                 files: {
-                    '<%= pkg.name %>.min.js': ['<%= concat.dist.dest %>']
+                    '<%= pkg.name %>.min.js': './src/<%= pkg.name %>.js'
                 }
             }
         },
@@ -39,9 +30,8 @@ module.exports = function(grunt){
 
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-jshint');
-    grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-cssmin');
 
-    grunt.registerTask("default", ["concat", "uglify", "cssmin"])
+    grunt.registerTask("default", ["uglify", "cssmin"])
 
 };

package.json

@@ -23,13 +23,13 @@
   },
   "homepage": "https://github.com/xbsoftware/enjoyhint",
   "devDependencies": {
-    "grunt-contrib-concat": "^0.5.1",
+    "grunt": "^0.4.5",
     "grunt-contrib-cssmin": "^0.11.0",
     "grunt-contrib-jshint": "^0.11.2",
     "grunt-contrib-uglify": "^0.9.1"
   },
   "dependencies": {
-    "grunt": "^0.4.5",
+    "jquery": "~2.1.3",
     "jquery.scrollto": "^2.1.2",
     "kinetic": "^5.2.0"
   }

src/enjoyhint.js

@@ -30,7 +30,7 @@ var EnjoyHint = function(configs) {
   var data = [];
   var current_step = 0;
 
-  $body = $(body);
+  var $body = $(body);
 
   /********************* PRIVATE METHODS ***************************************/
 
@@ -76,6 +76,14 @@ var EnjoyHint = function(configs) {
     $skipBtn.text(BTN_SKIP_TEXT);
   };
 
+  function hideCurrentHint(){
+    $body.enjoyhint('render_circle', []);
+    $('#enjoyhint_label').remove();
+    $('#enjoyhint_arrpw_line').remove();
+    $body.enjoyhint('hide_next');
+    $body.enjoyhint('hide_skip');
+  };
+
   var stepAction = function() {
     if (!(data && data[current_step])) {
       $body.enjoyhint("hide");
@@ -127,11 +135,10 @@ var EnjoyHint = function(configs) {
         that.clear();
       }, 250);
 
-      //$(document.body).scrollTop(step_data.selector, step_data.scrollAnimationSpeed || 250, {offset: -100});
-      var elemToScroll = document.querySelector(step_data.selector);
-      if (elemToScroll) {
-        let { x, y } = elemToScroll.getClientRects();
-        window.scrollTo(x, y);
+      var isHintInViewport = $(step_data.selector).get(0).getBoundingClientRect();
+      if(isHintInViewport.top < 0 || isHintInViewport.bottom > (window.innerHeight || document.documentElement.clientHeight)){
+          hideCurrentHint();
+          $(document.body).scrollTo(step_data.selector, step_data.scrollAnimationSpeed || 250, {offset: -200});
       }
 
       setTimeout(function() {