Permalink
Browse files

fix the hidden bug when trigger is manual

  • Loading branch information...
1 parent 9de2565 commit 94ac6f174aebc5c0b48df97c3fec8b40c7f1a4fd @sandywalker committed May 26, 2016
Showing with 15 additions and 13 deletions.
  1. +1 −1 .gitignore
  2. +1 −1 dist/jquery.webui-popover.css
  3. +6 −5 dist/jquery.webui-popover.js
  4. +2 −2 dist/jquery.webui-popover.min.js
  5. +5 −4 src/jquery.webui-popover.js
View
@@ -1,4 +1,4 @@
-node_modules
+node_modules/
.DS_Store
*.sublime-project
*.sublime-workspace
@@ -1,5 +1,5 @@
/*
- * webui popover plugin - v1.2.8
+ * webui popover plugin - v1.2.9
* 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!
* https://github.com/sandywalker/webui-popover
*
@@ -1,5 +1,5 @@
/*
- * webui popover plugin - v1.2.8
+ * webui popover plugin - v1.2.9
* 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!
* https://github.com/sandywalker/webui-popover
*
@@ -212,7 +212,6 @@
param: event dom event,
*/
hide: function(force, event) {
-
if (!force && this.getTrigger() === 'sticky') {
return;
}
@@ -275,15 +274,16 @@
},
/*core method ,show popover */
show: function() {
+ if (this._opened) {
+ return;
+ }
//removeAllTargets();
var
$target = this.getTarget().removeClass().addClass(pluginClass).addClass(this._customTargetClass);
if (!this.options.multi) {
this.hideAll();
}
- if (this._opened) {
- return;
- }
+
// use cache by default, if not cache setted , reInit the contents
if (!this.getCache() || !this._poped || this.content === '') {
this.content = '';
@@ -298,6 +298,7 @@
}
$target.show();
}
+
this.displayContent();
if (this.options.onShow) {
Oops, something went wrong.
@@ -204,7 +204,6 @@
param: event dom event,
*/
hide: function(force, event) {
-
if (!force && this.getTrigger() === 'sticky') {
return;
}
@@ -267,15 +266,16 @@
},
/*core method ,show popover */
show: function() {
+ if (this._opened) {
+ return;
+ }
//removeAllTargets();
var
$target = this.getTarget().removeClass().addClass(pluginClass).addClass(this._customTargetClass);
if (!this.options.multi) {
this.hideAll();
}
- if (this._opened) {
- return;
- }
+
// use cache by default, if not cache setted , reInit the contents
if (!this.getCache() || !this._poped || this.content === '') {
this.content = '';
@@ -290,6 +290,7 @@
}
$target.show();
}
+
this.displayContent();
if (this.options.onShow) {

0 comments on commit 94ac6f1

Please sign in to comment.