Update README.md

Updated branch to submit Pull Requests

README.md

@@ -1,21 +1,21 @@
 # X-editable
-
 In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery.  
 
-PLEASE SUBMIT ALL PULL REQUESTS TO THE 'dev' BRANCH!
-
-## Project status
-Unfortunately, **project is currently frozen**, as I don't have enough time for it.
-You could try use it as is, but there may be some bugs with newer versions of dependend libraries (e.g. bootstrap).
-I would really appreciate if someone take care of it.. See [#610](https://github.com/vitalets/x-editable/issues/610).
-Vitalets.
-
-## Live demo
+## Live Demo
 **http://vitalets.github.io/x-editable/demo.html**
 
+## Pull Requests
+Please submit all Pull Requests to the `develop` branch:  https://github.com/vitalets/x-editable/tree/develop
+
+## Issue Tracker
+Please report all issues here:  https://github.com/vitalets/x-editable/issues
+
 ## Documentation
 **http://vitalets.github.io/x-editable**
 
+## Project Status
+Actively maintained
+
 ## How to get it
 
 ### Manual download

bower.json

@@ -14,6 +14,6 @@
     "test"
   ],
   "dependencies": {
-    "jquery": ">=1.6"
+    "jquery": "~1.11"
   }   
 }

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "vitalets/x-editable",
     "description": "In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery.",
-    "version": "1.4.5",
+    "version": "1.5.1",
     "homepage": "http://github.com/vitalets/x-editable",
     "authors": [
         {

dist/bootstrap3-editable/js/bootstrap-editable.js

@@ -4418,7 +4418,7 @@ $(function(){
         //initial value, can be `new Date()`    
         value: null,                       
         minYear: 1970,
-        maxYear: 2015,
+        maxYear: new Date().getFullYear(),
         yearDescending: true,
         minuteStep: 5,
         secondStep: 1,
@@ -6804,4 +6804,4 @@ Automatically shown in inline mode.
     
     $.fn.editabletypes.datetimefield = DateTimeField;
 
-}(window.jQuery));
+}(window.jQuery));

src/inputs-ext/slider/slider.js

@@ -0,0 +1,68 @@
+/**
+Slider, based on the Slider plugin by Stefan Petre (http://www.eyecon.ro/bootstrap-slider).
+
+Make sure to include the plugin's code before using this editor.
+
+@class slider
+@extends text
+@since 1.5.0
+@final
+**/
+(function ($) {
+    "use strict";
+    
+    var Constructor = function (options) {
+        this.init('slider', options, Constructor.defaults);
+    };
+
+    $.fn.editableutils.inherit(Constructor, $.fn.editabletypes.text);
+
+    $.extend(Constructor.prototype, {
+        render: function() {
+            // need to set kewdown handler before apply slider
+            // for correct autosubmit
+            this.isAutosubmit = false;
+            var that = this;            
+            this.$input.on('keydown', function (e) {
+                if (!that.isAutosubmit) {
+                    return;
+                }
+                if (e.which === 13) {
+                    that.$input.closest('form').submit();
+                }
+            });            
+            
+            // apply slider
+            this.$input.slider(this.options.slider);
+        },
+        
+       value2input: function(value) {
+       		// make sure it's a number
+       		if(typeof value!='number')
+       			value=Number(value);
+       		if(isNaN(value))
+       			value=0;
+       		
+           this.$input.val(value);
+           this.$input.slider('setValue', value);
+       },
+
+        autosubmit: function() {
+            this.isAutosubmit = true;
+        }        
+    });      
+
+    Constructor.defaults = $.extend({}, $.fn.editabletypes.list.defaults, {
+        /**
+        @property tpl 
+        @default <input type="text">
+        **/         
+        tpl:'<input type="text">',
+        /**
+        **/
+        slider: null,
+    });
+
+    $.fn.editabletypes.slider = Constructor;      
+    
+}(window.jQuery));

src/inputs/combodate/lib/combodate.js

@@ -473,7 +473,7 @@
         //initial value, can be `new Date()`    
         value: null,                       
         minYear: 1970,
-        maxYear: 2015,
+        maxYear: (new Date().getFullYear()),
         yearDescending: true,
         minuteStep: 5,
         secondStep: 1,
@@ -483,4 +483,4 @@
         smartDays: false // whether days in combo depend on selected month: 31, 30, 28
     };
 
-}(window.jQuery));
+}(window.jQuery));