浏览代码

Update docs and code

zhixin 7 年之前
父节点
当前提交
f76e5050bd
共有 5 个文件被更改,包括 8 次插入7 次删除
  1. 1 0
      .gitignore
  2. 2 2
      docs/_includes/footer.html
  3. 3 3
      docs/_includes/header.html
  4. 1 1
      src/bootstrap-table.js
  5. 1 1
      src/extensions/export/bootstrap-table-export.js

+ 1 - 0
.gitignore

@@ -17,6 +17,7 @@ check.js
 nbproject
 .~lock.*
 package-lock.json
+*.lock
 .buildpath
 .idea
 .project

+ 2 - 2
docs/_includes/footer.html

@@ -7,8 +7,8 @@
 <!-- Placed at the end of the document so the pages load faster -->
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.js"></script>
-<script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/extensions/mobile/bootstrap-table-mobile.js"></script>
+<script src="https://unpkg.com/bootstrap-table/dist/bootstrap-table.min.js"></script>
+<script src="https://unpkg.com/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.min.js"></script>
 
 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
 <script src="../assets/js/ie10-viewport-bug-workaround.js"></script>

+ 3 - 3
docs/_includes/header.html

@@ -16,7 +16,7 @@
 <!-- Bootstrap CSS -->
 <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
 <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap-theme.min.css" rel="stylesheet">
-<link href="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.css" rel="stylesheet">
+<link href="https://unpkg.com/bootstrap-table/dist/bootstrap-table.min.css" rel="stylesheet">
 <link href="../assets/css/docs.min.css" rel="stylesheet">
 <link href="../assets/css/sidenav.css?v={{ site.current_version }}" rel="stylesheet">
 <link href="../assets/css/style.css?v={{ site.current_version }}&m=2" rel="stylesheet">
@@ -45,8 +45,8 @@
 </script>
 
 <script type="text/javascript">
-    if (window!=top) // 判断当前的window对象是否是top对象
-        top.location.href = window.location.href; // 如果不是,将top对象的网址自动导向被嵌入网页的网址
+  if (window!=top) // 判断当前的window对象是否是top对象
+    top.location.href = window.location.href; // 如果不是,将top对象的网址自动导向被嵌入网页的网址
 </script>
 
 <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>

+ 1 - 1
src/bootstrap-table.js

@@ -1315,7 +1315,7 @@
               value = Utils.calculateObjectValue(column,
                 this.header.formatters[j], [value, item, i], value)
             }
-            
+
             if (typeof value === 'string' || typeof value === 'number') {
               if (this.options.strictSearch) {
                 if ((`${value}`).toLowerCase() === s) {

+ 1 - 1
src/extensions/export/bootstrap-table-export.js

@@ -1,6 +1,6 @@
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * extensions: https://github.com/kayalshri/tableExport.jquery.plugin
+ * extensions: https://github.com/hhurz/tableExport.jquery.plugin
  */
 
 ($ => {