Release v0.2.5

LinkedInAttic · Jul 20, 2015 · 5a09436 · 5a09436
1 parent 91859ba
commit 5a09436
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 24 deletions.
diff --git a/archives/hopscotch-0.2.5.tar.gz b/archives/hopscotch-0.2.5.tar.gz
diff --git a/archives/hopscotch-0.2.5.zip b/archives/hopscotch-0.2.5.zip
diff --git a/dist/css/hopscotch.css b/dist/css/hopscotch.css
@@ -1,4 +1,4 @@
-/**! hopscotch - v0.2.4
+/**! hopscotch - v0.2.5
 *
 * Copyright 2015 LinkedIn Corp. All rights reserved.
 *
@@ -400,6 +400,10 @@ div.hopscotch-bubble.no-number .hopscotch-bubble-content {
   margin: 0;
 }
 div.hopscotch-bubble .hopscotch-bubble-close {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  border: 0;
   color: #000;
   background: transparent url(../img/sprite-green.png) -192px -92px no-repeat;
   display: block;

diff --git a/dist/css/hopscotch.min.css b/dist/css/hopscotch.min.css
diff --git a/dist/js/hopscotch.js b/dist/js/hopscotch.js
@@ -1,4 +1,4 @@
-/**! hopscotch - v0.2.4
+/**! hopscotch - v0.2.5
 *
 * Copyright 2015 LinkedIn Corp. All rights reserved.
 *
@@ -334,7 +334,7 @@
     },
 
     documentIsReady: function() {
-      return document.readyState === 'complete' || document.readyState === 'interactive';
+      return document.readyState === 'complete';
     },
 
     /**
@@ -741,6 +741,7 @@
           unsafe,
           currTour,
           totalSteps,
+          totalStepsI18n,
           nextBtnText,
           isLast,
           opts;
@@ -764,7 +765,8 @@
           unsafe = currTour.unsafe;
           if(Array.isArray(currTour.steps)){
             totalSteps = currTour.steps.length;
-            isLast = (idx === totalSteps - 1);
+            totalStepsI18n = this._getStepI18nNum(this._getStepNum(totalSteps - 1));
+            isLast = (this._getStepNum(idx) === this._getStepNum(totalSteps - 1));
           }
         }
       }else{
@@ -794,7 +796,8 @@
           prevBtn: utils.getI18NString('prevBtn'),
           nextBtn: nextBtnText,
           closeTooltip: utils.getI18NString('closeTooltip'),
-          stepNum: this._getStepI18nNum(this._getStepNum(idx))
+          stepNum: this._getStepI18nNum(this._getStepNum(idx)),
+          numSteps: totalStepsI18n
         },
         buttons:{
           showPrev: (utils.valOrDefault(step.showPrevButton, this.opt.showPrevButton) && (this._getStepNum(idx) > 0)),
@@ -1209,19 +1212,20 @@
         if (callouts[opt.id]) {
           throw new Error('Callout by that id already exists. Please choose a unique id.');
         }
+        if (!utils.getStepTarget(opt)) {
+          throw new Error('Must specify existing target element via \'target\' option.');
+        }
         opt.showNextButton = opt.showPrevButton = false;
         opt.isTourBubble = false;
         callout = new HopscotchBubble(opt);
         callouts[opt.id] = callout;
         calloutOpts[opt.id] = opt;
-        if (opt.target) {
-          callout.render(opt, null, function() {
-            callout.show();
-            if (opt.onShow) {
-              utils.invokeCallback(opt.onShow);
-            }
-          });
-        }
+        callout.render(opt, null, function() {
+          callout.show();
+          if (opt.onShow) {
+            utils.invokeCallback(opt.onShow);
+          }
+        });
       }
       else {
         throw new Error('Must specify a callout id.');
@@ -1328,7 +1332,7 @@
      * @returns {Object} HopscotchBubble
      */
     getBubble = function(setOptions) {
-      if (!bubble) {
+      if (!bubble || !bubble.element || !bubble.element.parentNode) {
         bubble = new HopscotchBubble(opt);
       }
       if (setOptions) {
@@ -1677,6 +1681,8 @@
           return this.endTour(true, false);
         }
         changeStepCb.call(this, currStepNum);
+      } else if (currStepNum + direction === currTour.steps.length) {
+        return this.endTour();
       }
 
       return this;
@@ -2514,11 +2520,9 @@ __p += '<button class="hopscotch-nav-button next hopscotch-next">' +
  } ;
 __p += '\n  </div>\n  ';
  if(buttons.showClose){ ;
-__p += '<a title="' +
-((__t = ( i18n.closeTooltip )) == null ? '' : __t) +
-'" href="#" class="hopscotch-bubble-close hopscotch-close">' +
+__p += '<button class="hopscotch-bubble-close hopscotch-close">' +
 ((__t = ( i18n.closeTooltip )) == null ? '' : __t) +
-'</a>';
+'</button>';
  } ;
 __p += '\n</div>\n<div class="hopscotch-bubble-arrow-container hopscotch-arrow">\n  <div class="hopscotch-bubble-arrow-border"></div>\n  <div class="hopscotch-bubble-arrow"></div>\n</div>';
 
@@ -2529,4 +2533,4 @@ return __p
 
   return winHopscotch;
 
-})));
+})));
diff --git a/dist/js/hopscotch.min.js b/dist/js/hopscotch.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hopscotch",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "A framework to make it easy for developers to add product tours to their pages.",
   "main": "dist/js/hopscotch.min.js",
   "directories": {