Permalink
Browse files

fix scroll problem

  • Loading branch information...
1 parent 85bb7ad commit d0ab0b480fcbb865b8806e976ee7915dd9e4e3f3 @sandywalker committed Apr 12, 2016
@@ -1,5 +1,5 @@
/*
- * webui popover plugin - v1.2.5
+ * webui popover plugin - v1.2.6
* 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.5
+ * webui popover plugin - v1.2.6
* 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
*
@@ -283,16 +283,7 @@
if (this._opened) {
return;
}
-<<<<<<< HEAD
-<<<<<<< HEAD
-
// use cache by default, if not cache setted , reInit the contents
-=======
- // use cache by default, if not cache setted , reInit the contents
->>>>>>> 82b51feabaf143b359ec7d7024f5b178d07ab218
-=======
- // use cache by default, if not cache setted , reInit the contents
->>>>>>> 82b51feabaf143b359ec7d7024f5b178d07ab218
if (!this.getCache() || !this._poped || this.content === '') {
this.content = '';
this.setTitle(this.getTitle());
Oops, something went wrong.
@@ -997,4 +997,4 @@
return (results.length) ? results : $result;
};
}));
-})(window, document);
+})(window, document);

0 comments on commit d0ab0b4

Please sign in to comment.