Skip to content

Commit 7578352

Browse files
committed
fix conflicts
2 parents a2b92b8 + a6d4415 commit 7578352

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

example/RTL/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ <h3 class="muted">Intro.js</h3>
4242
<hr>
4343

4444
<div class="jumbotron">
45-
<h1 data-step="1" data-intro="متن توضیح">RTL Style</span></h1>
45+
<h1 data-step="1" data-intro="متن توضیح">RTL Style</h1>
4646
<p class="lead" data-step="4" data-intro="یک مرحله دیگه">This is the <abbr lang="en" title="Right To Left">RTL</abbr> version of IntroJs which includes an addition CSS file to perform the RTL style.</p>
4747
<a class="btn btn-large btn-success" href="javascript:void(0);" onclick="javascript:introJs().setOptions({ 'nextLabel': 'بعد', 'prevLabel': 'قبل', 'skipLabel': 'خروج', 'doneLabel': 'اتمام' }).start();">Show me how</a>
4848
</div>
@@ -59,7 +59,7 @@ <h4>Section Two</h4>
5959

6060
<h4>Section Three</h4>
6161
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis augue a neque cursus ac blandit orci faucibus. Phasellus nec metus purus.</p>
62-
</div>
62+
</div>
6363

6464
<div class="span6" data-step="3" data-intro="امکانات بیشتر" data-position='left'>
6565
<h4>Section Four</h4>

intro.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,11 @@
193193
self._onKeyDown = function(e) {
194194
if (e.keyCode === 27 && self._options.exitOnEsc == true) {
195195
//escape key pressed, exit the intro
196-
_exitIntro.call(self, targetElm);
197-
//check if any callback is defined
196+
//check if exit callback is defined
198197
if (self._introExitCallback != undefined) {
199198
self._introExitCallback.call(self);
200199
}
200+
_exitIntro.call(self, targetElm);
201201
} else if(e.keyCode === 37) {
202202
//left arrow
203203
_previousStep.call(self);
@@ -212,6 +212,13 @@
212212
_previousStep.call(self);
213213
} else if (target && target.className.indexOf('introjs-skipbutton') > 0) {
214214
//user hit enter while focusing on skip button
215+
if (self._introItems.length - 1 == self._currentStep && typeof (self._introCompleteCallback) === 'function') {
216+
self._introCompleteCallback.call(self);
217+
}
218+
//check if any callback is defined
219+
if (self._introExitCallback != undefined) {
220+
self._introExitCallback.call(self);
221+
}
215222
_exitIntro.call(self, targetElm);
216223
} else {
217224
//default behavior for responding to enter
@@ -473,8 +480,9 @@
473480
// Modify so that the bottom of the tooltip connects with the target
474481
arrowLayer.className = "introjs-arrow left-bottom";
475482
tooltipLayer.style.top = "-" + (tooltipHeight - targetOffset.height - 20) + "px";
483+
} else {
484+
arrowLayer.className = 'introjs-arrow left';
476485
}
477-
arrowLayer.className = 'introjs-arrow left';
478486
break;
479487
case 'left':
480488
if (this._options.showStepNumbers == true) {
@@ -1070,12 +1078,12 @@
10701078

10711079
overlayLayer.onclick = function() {
10721080
if (self._options.exitOnOverlayClick == true) {
1073-
_exitIntro.call(self, targetElm);
10741081

10751082
//check if any callback is defined
10761083
if (self._introExitCallback != undefined) {
10771084
self._introExitCallback.call(self);
10781085
}
1086+
_exitIntro.call(self, targetElm);
10791087
}
10801088
};
10811089

introjs.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ tr.introjs-showElement > th {
6565

6666
.introjs-tooltipReferenceLayer {
6767
position: absolute;
68+
visibility: hidden;
6869
z-index: 10000000;
6970
background-color: transparent;
7071
-webkit-transition: all 0.3s ease-out;
@@ -86,6 +87,7 @@ tr.introjs-showElement > th {
8687

8788
.introjs-helperNumberLayer {
8889
position: absolute;
90+
visibility: visible;
8991
top: -16px;
9092
left: -16px;
9193
z-index: 9999999999 !important;
@@ -184,6 +186,7 @@ tr.introjs-showElement > th {
184186

185187
.introjs-tooltip {
186188
position: absolute;
189+
visibility: visible;
187190
padding: 10px;
188191
background-color: white;
189192
min-width: 200px;

0 commit comments

Comments
 (0)