Skip to content

Commit 3705a4e

Browse files
oguzhanoyaoguzhanoya
committed
Fix get step index
1 parent 178613f commit 3705a4e

11 files changed

+73
-43
lines changed

‎README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
[![npm](https://img.shields.io/npm/v/jquery.steps)](https://www.npmjs.com/package/jquery.steps)
44
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
5-
[![npm](https://img.shields.io/npm/dw/jquery.steps)](https://www.npmjs.com/package/jquery.steps)
5+
[![npm](https://img.shields.io/npm/dm/jquery.steps)](https://www.npmjs.com/package/jquery.steps)
6+
[![npm](https://img.shields.io/jsdelivr/npm/hm/jquery.steps)](https://www.npmjs.com/package/jquery.steps)
67

78
> A simple, lightweight jQuery step wizard plugin.
89
@@ -25,8 +26,8 @@ git clone http://github.com/oguzhanoya/jquery-steps.git
2526
```
2627
CDN
2728
```html
28-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.steps@1.1.1/dist/jquery-steps.min.css">
29-
<script src="https://cdn.jsdelivr.net/npm/jquery.steps@1.1.1/dist/jquery-steps.min.js"></script>
29+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.steps@1.1.2/dist/jquery-steps.min.css">
30+
<script src="https://cdn.jsdelivr.net/npm/jquery.steps@1.1.2/dist/jquery-steps.min.js"></script>
3031
```
3132

3233
## Setup
@@ -63,7 +64,7 @@ Make necessary markup for wizard. That's all, you don't need to do anything else
6364
```
6465
Include plugin and dependeces. jQuery is the only dependency, make sure to include it.
6566
```html
66-
<script src="http://code.jquery.com/jquery-latest.min.js"></script>
67+
<script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
6768
<script src="js/jquery-steps.js"></script>
6869
```
6970
Init plugin with choosen options.

‎dist/jquery-steps.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/jquery-steps.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/jquery-steps.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/api.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<hr>
4949
<button id="btnDestroy">Destroy</button>
5050

51-
<script src="http://code.jquery.com/jquery-latest.min.js"></script>
51+
<script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
5252
<script src="../dist/jquery-steps.js"></script>
5353
<script>
5454
var steps = $('#demo').steps({

‎examples/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</div>
3636
</div>
3737

38-
<script src="http://code.jquery.com/jquery-latest.min.js"></script>
38+
<script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
3939
<script src="../dist/jquery-steps.js"></script>
4040
<script>
4141
$('#demo').steps({

‎examples/callbacks.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ <h3>Tab5</h3>
6161
</div>
6262
</div>
6363

64-
<script src="http://code.jquery.com/jquery-latest.min.js"></script>
65-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.16.0/jquery.validate.min.js"></script>
64+
<script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
65+
<script src="https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/jquery.validate.min.js"></script>
6666
<script src="../dist/jquery-steps.js"></script>
6767
<script>
6868
var frmInfo = $('#frmInfo');

‎examples/multiple.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</div>
6060
</div>
6161

62-
<script src="http://code.jquery.com/jquery-latest.min.js"></script>
62+
<script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
6363
<script src="../dist/jquery-steps.js"></script>
6464
<script>
6565
$('#demo1').steps({

‎src/Steps.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class Steps {
7272
getStepIndex() {
7373
const all = this.el.find(this.stepSelector);
7474
const stepIndex = all.index(all.filter(`.${this.options.activeClass.split(' ').join('.')}`));
75-
return stepIndex || 0;
75+
return stepIndex;
7676
}
7777

7878
getMaxStepIndex() {

‎test/index.html

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,37 @@
44
<meta charset="utf-8">
55
<title>Jasmine Spec Runner</title>
66
<link rel="shortcut icon" type="image/png" href="http://jasmine.github.io/images/jasmine.ico">
7-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jasmine/2.99.2/jasmine.min.css">
8-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jasmine/2.99.2/jasmine.min.js"></script>
9-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jasmine/2.99.2/jasmine-html.min.js"></script>
10-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jasmine/2.99.2/boot.min.js"></script>
7+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jasmine/3.7.1/jasmine.min.css">
8+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jasmine/3.7.1/jasmine.min.js"></script>
9+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jasmine/3.7.1/jasmine-html.min.js"></script>
10+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jasmine/3.7.1/boot.min.js"></script>
1111
</head>
1212
<body>
1313

14-
<div class="step-app" id="demo" style="display: none;">
15-
<ul class="step-steps">
16-
<li data-step-target="step1">Step 1</li>
17-
<li data-step-target="step2">Step 2</li>
18-
<li data-step-target="step3">Step 3</li>
19-
</ul>
20-
<div class="step-content">
21-
<div class="step-tab-panel" data-step="step1">
22-
... step1
14+
<script id="tpl-demo" type="text/html">
15+
<div class="step-app" id="demo" style="display: none;">
16+
<ul class="step-steps">
17+
<% for(var i = 0; i < stepsCount; i++){ %>
18+
<li data-step-target="step{{i}}">Step {{i}}</li>
19+
<% } %>
20+
</ul>
21+
<div class="step-content">
22+
<% for(var i = 0; i < stepsCount; i++){ %>
23+
<div class="step-tab-panel" data-step="step{{i}}">
24+
... step{{i}}
25+
</div>
26+
<% } %>
2327
</div>
24-
<div class="step-tab-panel" data-step="step2">
25-
... step2
28+
<div class="step-footer">
29+
<button data-step-action="prev" class="step-btn">Previous</button>
30+
<button data-step-action="next" class="step-btn">Next</button>
31+
<button data-step-action="finish" class="step-btn">Finish</button>
2632
</div>
27-
<div class="step-tab-panel" data-step="step3">
28-
... step3
29-
</div>
30-
</div>
31-
<div class="step-footer">
32-
<button data-step-action="prev" class="step-btn">Previous</button>
33-
<button data-step-action="next" class="step-btn">Next</button>
34-
<button data-step-action="finish" class="step-btn">Finish</button>
3533
</div>
36-
</div>
34+
</script>
3735

38-
<script src="http://code.jquery.com/jquery-latest.min.js"></script>
36+
<script src="https://cdn.jsdelivr.net/npm/art-template@4.13.2/lib/template-web.js"></script>
37+
<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
3938
<script src="../dist/jquery-steps.js"></script>
4039
<script src="spec.js"></script>
4140
</body>

‎test/spec.js

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,38 @@
1-
describe('My Plugin', function () {
1+
describe('jquery steps', function () {
2+
3+
var steps_api;
4+
beforeEach(function () {
5+
var data = {
6+
stepsCount: 3,
7+
};
8+
var html = template('tpl-demo', data);
9+
document.body.insertAdjacentHTML('afterbegin', html);
10+
var steps = $('#demo').steps();
11+
steps_api = steps.data('plugin_Steps');
12+
});
13+
14+
afterEach(function () {
15+
steps_api.destroy();
16+
});
217

318
it('version', function () {
419
var ver = $.fn.steps.version;
5-
expect(ver).toEqual('1.1.0');
20+
expect(ver).toEqual('1.1.2');
21+
});
22+
23+
it('next', function () {
24+
steps_api.next();
25+
steps_api.next();
26+
var idx = steps_api.getStepIndex();
27+
expect(idx).toEqual(2);
28+
});
29+
30+
it('prev', function () {
31+
steps_api.next();
32+
steps_api.next();
33+
steps_api.prev();
34+
var idx = steps_api.getStepIndex();
35+
expect(idx).toEqual(1);
636
});
737

838
});

0 commit comments

Comments
 (0)