Skip to content

Commit 41a2fa9

Browse files
committed
format code and update version
1 parent 8b87273 commit 41a2fa9

File tree

5 files changed

+25
-13
lines changed

5 files changed

+25
-13
lines changed

dist/jquery.webui-popover.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* webui popover plugin - v1.0.5
2+
* webui popover plugin - v1.0.9
33
* A lightWeight popover plugin with jquery ,enchance the popover plugin of bootstrap with some awesome new features. It works well with bootstrap ,but bootstrap is not necessary!
44
* https://github.com/sandywalker/webui-popover
55
*

dist/jquery.webui-popover.js

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* webui popover plugin - v1.0.5
2+
* webui popover plugin - v1.0.9
33
* A lightWeight popover plugin with jquery ,enchance the popover plugin of bootstrap with some awesome new features. It works well with bootstrap ,but bootstrap is not necessary!
44
* https://github.com/sandywalker/webui-popover
55
*
@@ -211,19 +211,31 @@
211211
return this.getTarget().find('.'+pluginClass+'-content');
212212
},
213213
getTitle:function(){
214-
return this.options.title||this.$element.attr('data-title')||this.$element.attr('title');
214+
return this.$element.attr('data-title')||this.options.title||this.$element.attr('title');
215215
},
216216
getUrl:function(){
217-
return this.options.url||this.$element.attr('data-url');
217+
return this.$element.attr('data-url')||this.options.url;
218218
},
219219
getDelayShow:function(){
220-
return this.options.delay.show||this.$element.attr('data-delay-show')||0;
220+
var dataAttr = this.$element.attr('data-delay-show');
221+
if (typeof(dataAttr) !== 'undefined') {
222+
return dataAttr;
223+
}
224+
return this.options.delay.show||0;
221225
},
222226
getHideDelay:function(){
223-
return this.options.delay.hide||this.$element.attr('data-delay-hide')||300;
227+
var dataAttr = this.$element.attr('data-delay-hide');
228+
if (typeof(dataAttr) !== 'undefined') {
229+
return dataAttr;
230+
}
231+
return this.options.delay.hide||300;
224232
},
225233
getConstrains:function(){
226-
return this.options.constrains||this.$element.attr('data-contrains');
234+
var dataAttr = this.$element.attr('data-contrains');
235+
if (typeof(dataAttr) !== 'undefined') {
236+
return dataAttr;
237+
}
238+
return this.options.constrains;
227239
},
228240
setTitle:function(title){
229241
var $titleEl = this.getTitleElement();

dist/jquery.webui-popover.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.

0 commit comments

Comments
 (0)