release 1.1.0

tshi0912 · Sep 9, 2016 · 868a426 · 868a426
1 parent 79cea14
commit 868a426
Show file tree

Hide file tree

Showing 13 changed files with 171 additions and 123 deletions.
diff --git a/dist/css/city-picker.css b/dist/css/city-picker.css
@@ -105,6 +105,7 @@
     min-height: 10px;
     background-color: #fff;
     padding: 10px 15px;
+	box-sizing: border-box;
 }
 
 .city-select {
@@ -158,4 +159,4 @@
     background-color: #46A4FF;
     color: #fff;
     border-radius: 2px;
-}
+}
diff --git a/dist/js/city-picker.data.js b/dist/js/city-picker.data.js
@@ -1,11 +1,11 @@
 /*!
- * Distpicker v1.0.2
+ * Distpicker v1.1.0
  * https://github.com/tshi0912/city-picker
  *
  * Copyright (c) 2014-2016 Tao Shi
  * Released under the MIT license
  *
- * Date: 2016-03-17T07:47:48.060Z
+ * Date: 2016-09-09T12:11:57.115Z
  */
 
 (function (factory) {

diff --git a/dist/js/city-picker.data.min.js b/dist/js/city-picker.data.min.js
diff --git a/dist/js/city-picker.js b/dist/js/city-picker.js
@@ -1,11 +1,11 @@
 /*!
- * CityPicker v1.0.2
+ * CityPicker v1.1.0
  * https://github.com/tshi0912/citypicker
  *
  * Copyright (c) 2015-2016 Tao Shi
  * Released under the MIT license
  *
- * Date: 2016-03-17T07:47:48.063Z
+ * Date: 2016-09-09T12:11:57.119Z
  */
 
 (function (factory) {
@@ -356,6 +356,18 @@
             }
         },
 
+        getCode: function (count) {
+            var obj = {}, arr = [];
+            this.$textspan.find('.select-item')
+                .each(function () {
+                    var code = $(this).data('code');
+                    var count = $(this).data('count');
+                    obj[count] = code;
+                    arr.push(code);
+                });
+            return count ? obj[count] : arr.join('/');
+        },
+
         getVal: function () {
             var text = '';
             this.$dropdown.find('.city-select')

diff --git a/dist/js/city-picker.min.js b/dist/js/city-picker.min.js
diff --git a/docs/css/city-picker.css b/docs/css/city-picker.css
@@ -105,6 +105,7 @@
     min-height: 10px;
     background-color: #fff;
     padding: 10px 15px;
+	box-sizing: border-box;
 }
 
 .city-select {
@@ -158,4 +159,4 @@
     background-color: #46A4FF;
     color: #fff;
     border-radius: 2px;
-}
+}
diff --git a/docs/css/main.css b/docs/css/main.css
@@ -4,168 +4,167 @@
 /* Header */
 
 .docs-header {
-  margin-bottom: 0;
+    margin-bottom: 0;
 }
 
 .navbar-toggle:hover,
 .navbar-toggle:focus {
-  border-color: #337ab7;
+    border-color: #337ab7;
 }
 
 .navbar-toggle .icon-bar {
-  background-color: #337ab7;
+    background-color: #337ab7;
 }
 
-
 /* Jumbotron */
 
 .docs-jumbotron {
-  background-color: #3f51b5;
-  color: #fff;
+    background-color: #3f51b5;
+    color: #fff;
 }
 
 .docs-jumbotron .version {
-  font-size: 14px;
-  color: #fff;
-  filter: alpha(opacity=50);
-  opacity: 0.5;
+    font-size: 14px;
+    color: #fff;
+    filter: alpha(opacity=50);
+    opacity: 0.5;
 }
 
-
 .docs-carbonads-container {
-  position: relative;
+    position: relative;
 }
 
 .docs-carbonads {
-  max-width: 350px;
-  padding: 15px;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  overflow: hidden;
+    max-width: 350px;
+    padding: 15px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    overflow: hidden;
 }
 
 .carbon-wrap {
-  overflow: hidden;
+    overflow: hidden;
 }
 
 .carbon-img {
-  clear: left;
-  float: left;
-  display: block;
+    clear: left;
+    float: left;
+    display: block;
 }
 
 .carbon-text,
 .carbon-poweredby {
-  display: block;
-  margin-left: 140px;
+    display: block;
+    margin-left: 140px;
 }
 
 .carbon-text,
 .carbon-text:hover,
 .carbon-text:focus {
-  color: #fff;
-  text-decoration: none;
+    color: #fff;
+    text-decoration: none;
 }
 
 .carbon-poweredby,
 .carbon-poweredby:hover,
 .carbon-poweredby:focus {
-  color: #ddd;
-  text-decoration: none;
+    color: #ddd;
+    text-decoration: none;
 }
 
 @media (min-width: 992px) {
-  .docs-carbonads {
-    position: absolute;
-    right: 0;
-    bottom: 5px;
-  }
+    .docs-carbonads {
+        position: absolute;
+        right: 0;
+        bottom: 5px;
+    }
 }
 
-
 /* Content */
 
 .dropzone {
-  padding: 150px 15px;
-  border: 1px dashed #eee;
-  background-color: #fcfcfc;
-  text-align: center;
+    padding: 150px 15px;
+    border: 1px dashed #eee;
+    background-color: #fcfcfc;
+    text-align: center;
 }
 
 .dropzone > input {
-  display: inline-block;
-  vertical-align: top;
+    display: inline-block;
+    vertical-align: top;
 }
 
 .logs {
-  height: 320px;
-  padding: 10px 15px;
-  border: 1px solid #eee;
-  background-color: #fcfcfc;
-  overflow-x: hidden;
-  overflow-y: auto;
+    height: 320px;
+    padding: 10px 15px;
+    border: 1px solid #eee;
+    background-color: #fcfcfc;
+    overflow-x: hidden;
+    overflow-y: auto;
 }
 
 .logs > p {
-  margin-bottom: 5px;
-  color: #666;
+    margin-bottom: 5px;
+    color: #666;
 }
 
-
 /* Footer */
 
 .docs-footer {
-  overflow: hidden;
-  margin-bottom: 300px;
+    overflow: hidden;
+    margin-bottom: 300px;
 }
 
 .hearts {
-  position: relative;
-  display: block;
-  width: 100%;
-  height: 30px;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  color: #ddd;
-  font-size: 18px;
-  line-height: 30px;
-  text-align: center;
+    position: relative;
+    display: block;
+    width: 100%;
+    height: 30px;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    color: #ddd;
+    font-size: 18px;
+    line-height: 30px;
+    text-align: center;
 }
 
 .hearts:hover {
-  color: #ff4136;
+    color: #ff4136;
 }
 
 .hearts:before {
-  position: absolute;
-  top: 50%;
-  right: 0;
-  left: 0;
-  display: block;
-  height: 0;
-  border-top: 1px solid #eee;
-  content: " ";
+    position: absolute;
+    top: 50%;
+    right: 0;
+    left: 0;
+    display: block;
+    height: 0;
+    border-top: 1px solid #eee;
+    content: " ";
 }
 
 .hearts:after {
-  position: relative;
-  z-index: 1;
-  padding-left: 8px;
-  padding-right: 8px;
-  background-color: #fff;
-  content: "♥";
+    position: relative;
+    z-index: 1;
+    padding-left: 8px;
+    padding-right: 8px;
+    background-color: #fff;
+    content: "♥";
 }
 
-input{
-  min-width: 360px;
+input {
+    min-width: 360px;
 }
 
+.dropup {
+    display: inline-block;
+}
 
 /* Google Code Prettify
  * -------------------------------------------------------------------------- */
 
 .prettyprint {
-  margin-bottom: 0;
-  padding: 15px !important;
-  border: 1px solid #ddd !important;
+    margin-bottom: 0;
+    padding: 15px !important;
+    border: 1px solid #ddd !important;
 }
diff --git a/docs/index.html b/docs/index.html
@@ -85,7 +85,8 @@ <h5>Demo:</h5>
 
     <form class="form-inline">
         <div style="position: relative;">
-            <input class="form-control" readonly type="text" data-toggle="city-picker" data-level="city" placeholder="请选择省/市">
+            <input class="form-control" readonly type="text" data-toggle="city-picker" data-level="city"
+                   placeholder="请选择省/市">
         </div>
     </form>
 
@@ -127,7 +128,8 @@ <h5>Demo:</h5>
 
     <form class="form-inline">
         <div style="position: relative;">
-            <input class="form-control" readonly type="text" data-responsive="true" data-toggle="city-picker" style="width:50%;">
+            <input class="form-control" readonly type="text" data-responsive="true" data-toggle="city-picker"
+                   style="width:50%;">
         </div>
     </form>
 
@@ -202,12 +204,29 @@ <h2 class="page-header">Methods</h2>
             <div id="distpicker">
                 <div class="form-group">
                     <div style="position: relative;">
-                        <input id="city-picker3" class="form-control" readonly type="text" value="江苏省/常州市/溧阳市" data-toggle="city-picker">
+                        <input id="city-picker3" class="form-control" readonly type="text" value="江苏省/常州市/溧阳市"
+                               data-toggle="city-picker">
                     </div>
                 </div>
                 <div class="form-group">
-                    <button class="btn btn-warning" id="reset" type="button">Reset</button>
-                    <button class="btn btn-danger" id="destroy" type="button">Destroy</button>
+                    <button class="btn btn-warning" id="reset" type="button">reset</button>
+                    <button class="btn btn-danger" id="destroy" type="button">destroy</button>
+
+                    <div class="dropup">
+                        <button id="code-count" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                            <span class="text">Full Code</span>
+                            <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu">
+                            <li><a href="javascript:void(0);" data-count="">Full Code</a></li>
+                            <li role="separator" class="divider"></li>
+                            <li><a href="javascript:void(0);" data-count="province">Province Code</a></li>
+                            <li><a href="javascript:void(0);" data-count="city">City Code</a></li>
+                            <li><a href="javascript:void(0);" data-count="district">District Code</a></li>
+                        </ul>
+                    </div>
+                    <button class="btn btn-success" id="get-code" type="button">getCode<span class="code"></span>
+                    </button>
                 </div>
             </div>
         </form>

diff --git a/docs/js/city-picker.data.js b/docs/js/city-picker.data.js
@@ -1,11 +1,11 @@
 /*!
- * Distpicker v1.0.2
+ * Distpicker v1.1.0
  * https://github.com/tshi0912/city-picker
  *
  * Copyright (c) 2014-2016 Tao Shi
  * Released under the MIT license
  *
- * Date: 2016-03-17T07:47:48.060Z
+ * Date: 2016-09-09T12:11:57.115Z
  */
 
 (function (factory) {