Skip to content

Commit 62bc7cf

Browse files
committed
update
2 parents 40156d2 + 9195e22 commit 62bc7cf

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

dist/jquery-asSpinner.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
this.options = $.extend({}, AsSpinner.defaults, options, this.$element.data());
1212
this.namespace = this.options.namespace;
1313

14-
if (this.$element.attr('name')) {
15-
this.name = this.$element.attr('name');
16-
} else {
17-
this.name = this.options.name;
18-
}
19-
2014
if (this.options.rule) {
2115
var self = this;
2216
var array = ['min', 'max', 'step', 'precision'];
@@ -181,7 +175,12 @@
181175
} else {
182176
self.spinDown();
183177
}
178+
<<<<<<< HEAD
184179
return false;
180+
=======
181+
182+
event.preventDefault();
183+
>>>>>>> 9195e22fd64c9836400ce02a346fb8d3e7b9d80f
185184
});
186185
}
187186
}).on('blur.asSpinner', function() {

dist/jquery-asSpinner.min.js

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

src/jquery-asSpinner.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@
1515
this.options = $.extend({}, AsSpinner.defaults, options, this.$element.data());
1616
this.namespace = this.options.namespace;
1717

18-
if (this.$element.attr('name')) {
19-
this.name = this.$element.attr('name');
20-
} else {
21-
this.name = this.options.name;
22-
}
23-
2418
if (this.options.rule) {
2519
var self = this;
2620
var array = ['min', 'max', 'step', 'precision'];

0 commit comments

Comments
 (0)