v3.1.1

aliihsan83 · Jan 18, 2016 · 22a89d2 · 22a89d2
1 parent 8b40e30
commit 22a89d2
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,8 @@
 .hg
 .hgignore
+.idea
+*.log
 nbproject
 index_demo_site.html
-nbproject
 node_modules
 bower_components
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,12 +1,12 @@
 Bootstrap TouchSpin
-v1.0.0
+v3.1.1
 
 A mobile and touch friendly input spinner component for Bootstrap 3.
 
     https://github.com/istvan-meszaros/bootstrap-touchspin
     http://www.virtuosoft.eu/code/bootstrap-touchspin/
 
-Copyright 2013 István Ujj-Mészáros
+Copyright 2013-2015 István Ujj-Mészáros
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,4 +18,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
diff --git a/bootstrap-touchspin.jquery.json b/bootstrap-touchspin.jquery.json
@@ -10,7 +10,7 @@
         "spinbutton",
         "spinner"
     ],
-    "version": "3.0.1",
+    "version": "3.1.1",
     "author": {
         "name": "István Ujj-Mészáros",
         "url": "https://github.com/istvan-ujjmeszaros"
@@ -28,4 +28,4 @@
     "dependencies": {
         "jquery": ">=1.7"
     }
-}
+}
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-touchspin",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "homepage": "http://www.virtuosoft.eu/code/bootstrap-touchspin/",
   "authors": [
     {

diff --git a/dist/jquery.bootstrap-touchspin.css b/dist/jquery.bootstrap-touchspin.css
@@ -1,5 +1,5 @@
 /*
- *  Bootstrap TouchSpin - v3.0.1
+ *  Bootstrap TouchSpin - v3.1.1
  *  A mobile and touch friendly input spinner component for Bootstrap 3.
  *  http://www.virtuosoft.eu/code/bootstrap-touchspin/
  *

diff --git a/dist/jquery.bootstrap-touchspin.js b/dist/jquery.bootstrap-touchspin.js
@@ -1,5 +1,5 @@
 /*
- *  Bootstrap TouchSpin - v3.0.1
+ *  Bootstrap TouchSpin - v3.1.1
  *  A mobile and touch friendly input spinner component for Bootstrap 3.
  *  http://www.virtuosoft.eu/code/bootstrap-touchspin/
  *
@@ -43,6 +43,7 @@
       min: 0,
       max: 100,
       initval: '',
+      replacementval: '',
       step: 1,
       decimals: 0,
       stepinterval: 100,
@@ -69,6 +70,7 @@
       min: 'min',
       max: 'max',
       initval: 'init-val',
+      replacementval: 'replacement-val',
       step: 'step',
       decimals: 'decimals',
       stepinterval: 'step-interval',
@@ -519,6 +521,10 @@
         val = originalinput.val();
 
         if (val === '') {
+          if (settings.replacementval !== '') {
+            originalinput.val(settings.replacementval);
+            originalinput.trigger('change');
+          }
           return;
         }
 
@@ -529,7 +535,12 @@
         parsedval = parseFloat(val);
 
         if (isNaN(parsedval)) {
-          parsedval = 0;
+          if (settings.replacementval !== '') {
+            parsedval = settings.replacementval;
+          }
+          else {
+            parsedval = 0;
+          }
         }
 
         returnval = parsedval;

diff --git a/dist/jquery.bootstrap-touchspin.min.css b/dist/jquery.bootstrap-touchspin.min.css
@@ -1,5 +1,5 @@
 /*
- *  Bootstrap TouchSpin - v3.0.1
+ *  Bootstrap TouchSpin - v3.1.1
  *  A mobile and touch friendly input spinner component for Bootstrap 3.
  *  http://www.virtuosoft.eu/code/bootstrap-touchspin/
  *

diff --git a/dist/jquery.bootstrap-touchspin.min.js b/dist/jquery.bootstrap-touchspin.min.js
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "url": "http://github.com/istvan-ujjmeszaros/bootstrap-touchspin.git"
   },
   "homepage": "http://www.virtuosoft.eu/code/bootstrap-touchspin/",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-cli": "~0.1.13",