Skip to content

Commit 45a6182

Browse files
committed
Minor changes
1 parent 1c434d9 commit 45a6182

File tree

4 files changed

+38
-9
lines changed

4 files changed

+38
-9
lines changed

js/fileinput.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@
162162
$.fn.fileinput = function (options) {
163163
return this.each(function () {
164164
var $this = $(this),
165-
data = $this.data('fileinput')
166-
if (!data) $this.data('fileinput', (data = new Fileinput(this, options)))
165+
data = $this.data('bs.fileinput')
166+
if (!data) $this.data('bs.fileinput', (data = new Fileinput(this, options)))
167167
if (typeof options == 'string') data[options]()
168168
})
169169
}
@@ -185,7 +185,7 @@
185185

186186
$(document).on('click.fileinput.data-api', '[data-provides="fileinput"]', function (e) {
187187
var $this = $(this)
188-
if ($this.data('fileinput')) return
188+
if ($this.data('bs.fileinput')) return
189189
$this.fileinput($this.data())
190190

191191
var $target = $(e.target).closest('[data-dismiss="fileinput"],[data-trigger="fileinput"]');

js/inputmask.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,9 @@
330330
$.fn.inputmask = function (options) {
331331
return this.each(function () {
332332
var $this = $(this)
333-
var data = $this.data('inputmask')
333+
var data = $this.data('bs.inputmask')
334334

335-
if (!data) $this.data('inputmask', (data = new Inputmask(this, options)))
335+
if (!data) $this.data('bs.inputmask', (data = new Inputmask(this, options)))
336336
})
337337
}
338338

@@ -353,7 +353,7 @@
353353

354354
$(document).on('focus.bs.inputmask.data-api', '[data-mask]', function (e) {
355355
var $this = $(this)
356-
if ($this.data('inputmask')) return
356+
if ($this.data('bs.inputmask')) return
357357
$this.inputmask($this.data())
358358
})
359359

js/rowlink.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
$.fn.rowlink = function (options) {
5555
return this.each(function () {
5656
var $this = $(this)
57-
var data = $this.data('rowlink')
58-
if (!data) $this.data('rowlink', (data = new Rowlink(this, options)))
57+
var data = $this.data('bs.rowlink')
58+
if (!data) $this.data('bs.rowlink', (data = new Rowlink(this, options)))
5959
})
6060
}
6161

@@ -78,7 +78,7 @@
7878
if ($(e.target).closest('.rowlink-skip').length !== 0) return
7979

8080
var $this = $(this)
81-
if ($this.data('rowlink')) return
81+
if ($this.data('bs.rowlink')) return
8282
$this.rowlink($this.data())
8383
$(e.target).trigger('click.bs.rowlink')
8484
})

less/build/mixins.less

+29
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,32 @@
3030
-webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1
3131
box-shadow: @shadow;
3232
}
33+
.transition(@transition) {
34+
-webkit-transition: @transition;
35+
-o-transition: @transition;
36+
transition: @transition;
37+
}
38+
39+
// Transition
40+
.transition-property(@transition-property) {
41+
-webkit-transition-property: @transition-property;
42+
transition-property: @transition-property;
43+
}
44+
.transition-delay(@transition-delay) {
45+
-webkit-transition-delay: @transition-delay;
46+
transition-delay: @transition-delay;
47+
}
48+
.transition-duration(@transition-duration) {
49+
-webkit-transition-duration: @transition-duration;
50+
transition-duration: @transition-duration;
51+
}
52+
.transition-timing-function(@timing-function) {
53+
-webkit-transition-timing-function: @timing-function;
54+
transition-timing-function: @timing-function;
55+
}
56+
.transition-transform(@transition) {
57+
-webkit-transition: -webkit-transform @transition;
58+
-moz-transition: -moz-transform @transition;
59+
-o-transition: -o-transform @transition;
60+
transition: transform @transition;
61+
}

0 commit comments

Comments
 (0)