update readme and history doc

sandywalker · Oct 18, 2016 · d8f5e15 · d8f5e15
1 parent 5e37fea
commit d8f5e15
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -2,7 +2,14 @@
 
 
 # History
-### 1.2.15
+### 1.2.17
+* fixed  some bugs
+* add new global method 'updateContentAsync' for async mode.
+* add new global method 'setDefaultOptions'
+
+
+### 1.2.16
+* fixed some bugs.
 
 
 ### 1.2.14

diff --git a/README.md b/README.md
@@ -275,6 +275,11 @@ WebuiPopovers.updateContentAsync('.btn-showpop','http://someUrl');
 
 ```
 
+//Set global default options
+WebuiPopovers.setDefaultOptions(options);
+
+```
+
 Full Methods
 
 ```js
@@ -285,6 +290,7 @@ Full Methods
 	WebuiPopovers.isCreated(selector); // Check if the popover is already create and bind to the selector.
 	WebuiPopovers.updateContent(selector,newContent) //Update the Popover content after the popover is created.
 	WebuiPopovers.updateContentAsync(selector,url) //Update the Popover content asynchronously after the popover is created.
+	WebuiPopovers.setDefaultOptions(options) //Change the global default options.
 ```
 
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "webui-popover",
-  "version": "1.2.16",
+  "version": "1.2.17",
   "authors": [
     "sandywalker <sanddywalker@gmail.com>"
   ],

diff --git a/demo/test-issue195.html b/demo/test-issue195.html
@@ -41,7 +41,7 @@
 </head>
 <body>
     <p>&nbsp;</p>
-    &nbsp;&nbsp;&nbsp;&nbsp;<a href="#" class="btn btn-default btn-showpop"  data-placement="right-bottom">show Pop</a>
+    &nbsp;&nbsp;&nbsp;&nbsp;<a href="#" class="btn btn-default btn-showpop"  data-width="500" data-height="400" data-placement="right-bottom">show Pop</a>
     <div class="webui-popover-content">
       <p>popover content</p>
     </div>

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "A enhancement popover plugin for Bootstrap ,but you can use it stand-alone without Bootstrap!",
   "author": "Sandy Duan <sanddywalker@gmail.com>",
   "homepage": "https://github.com/sandywalker/webui-popover",
-  "version": "1.2.16",
+  "version": "1.2.17",
   "license": "MIT",
   "devDependencies": {
     "grunt": "~0.4.1",

diff --git a/webui-popover.jquery.json b/webui-popover.jquery.json
@@ -8,7 +8,7 @@
         "webui",
         "pop"
     ],
-    "version":"1.2.16",
+    "version":"1.2.17",
     "author": {
         "name": "Sandy Duan",
         "email": "sanddywalker@gmail.com",