bootstrap-editable-rails 0.0.4 → 0.0.5

data/README.md

@@ -89,6 +89,23 @@ def update
 end
 ```
 
+#### Known issue
+
+The scaffold above will not work with jQuery 1.9.0 (included in jquery-rails 2.2.0) because of jQuery's bug.
+
+https://github.com/jquery/jquery/pull/1142
+
+To avoid it, you can do one of the following (and so on).
+
+1. Respond with some value, not empty
+
+ `format.json { render json: @post } # 200 OK`
+
+2. Not use jQuery 1.9.0
+
+ `gem 'jquery-rails', '2.1.4'` in Gemfile
+
+
 
 ## Contributing
 

data/bootstrap-editable-rails.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "railties", "~> 3.1"
+  gem.add_dependency "railties", ">= 3.1"
 end

data/lib/bootstrap-editable-rails/version.rb

@@ -1,7 +1,7 @@
 module Bootstrap
   module Editable
     module Rails
-      VERSION = "0.0.4"
+      VERSION = "0.0.5"
     end
   end
 end

data/vendor/assets/javascripts/bootstrap-editable.js

@@ -1,4 +1,4 @@
-/*! X-editable - v1.4.1 
+/*! X-editable - v1.4.3 
 * In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
 * http://github.com/vitalets/x-editable
 * Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
@@ -494,7 +494,7 @@ Editableform is linked with one of input types, e.g. 'text', 'select' etc.
         **/          
         success: null,
         /**
-        Additional options for ajax request.
+        Additional options for submit ajax request.
         List of values: http://api.jquery.com/jQuery.ajax
         
         @property ajaxOptions 
@@ -711,7 +711,7 @@ Editableform is linked with one of input types, e.g. 'text', 'select' etc.
 
            $.each(sourceData, function(i, o) {
                if(o.children) {
-                   result = result.concat(that.itemsByValue(value, o.children));
+                   result = result.concat(that.itemsByValue(value, o.children, valueProp));
                } else {
                    /*jslint eqeq: true*/
                    if(isValArray) {
@@ -831,7 +831,8 @@ Applied as jQuery method.
                     }
                 });
 
-                //close containers when click outside
+                //close containers when click outside 
+                //(mousedown could be better than click, it closes everything also on drag drop)
                 $(document).on('click.editable', function(e) {
                     var $target = $(e.target), i,
                         exclude_classes = ['.editable-container', 
@@ -880,7 +881,7 @@ Applied as jQuery method.
 
         /* returns container object */
         container: function() {
-            return this.$element.data(this.containerName); 
+            return this.$element.data(this.containerDataName || this.containerName); 
         },
 
         call: function() {
@@ -909,8 +910,8 @@ Applied as jQuery method.
                     @param {Object} event event object
                     @example
                     $('#username').on('shown', function() {
-                         var $tip = $(this).data('editableContainer').tip();
-                         $tip.find('input').val('overwriting value of input..');
+                        var editable = $(this).data('editable');
+                        editable.input.$input.val('overwriting value of input..');
                     });                     
                     **/                      
                     this.$element.triggerHandler('shown');
@@ -1211,9 +1212,9 @@ Applied as jQuery method.
         Animation speed (inline mode)
         @property anim 
         @type string
-        @default 'fast'
+        @default false
         **/        
-        anim: 'fast',
+        anim: false,
         
         /**
         Mode of editable, can be `popup` or `inline` 
@@ -1320,7 +1321,9 @@ Makes editable any HTML element on the page. Applied as jQuery method.
             //name
             this.options.name = this.options.name || this.$element.attr('id');
              
-            //create input of specified type. Input will be used for converting value, not in form
+            //create input of specified type. Input needed already here to convert value for initial display (e.g. show text by id for select)
+            //also we set scope option to have access to element inside input specific callbacks (e. g. source as function)
+            this.options.scope = this.$element[0]; 
             this.input = $.fn.editableutils.createInput(this.options);
             if(!this.input) {
                 return; 
@@ -1371,9 +1374,19 @@ Makes editable any HTML element on the page. Applied as jQuery method.
             }
             
             //check conditions for autotext:
-            //if value was generated by text or value is empty, no sense to run autotext
-            doAutotext = !isValueByText && this.value !== null && this.value !== undefined;
-            doAutotext &= (this.options.autotext === 'always') || (this.options.autotext === 'auto' && !this.$element.text().length);
+            switch(this.options.autotext) {
+              case 'always':
+               doAutotext = true;
+              break;
+              case 'auto':
+                //if element text is empty and value is defined and value not generated by text --> run autotext
+                doAutotext = !$.trim(this.$element.text()).length && this.value !== null && this.value !== undefined && !isValueByText;
+              break;
+              default:
+               doAutotext = false;
+            }
+
+            //depending on autotext run render() or just finilize init
             $.when(doAutotext ? this.render() : true).then($.proxy(function() {
                 if(this.options.disabled) {
                     this.disable();
@@ -1409,6 +1422,11 @@ Makes editable any HTML element on the page. Applied as jQuery method.
            this.$element.on(this.options.toggle + '.editable', selector, $.proxy(function(e){
                var $target = $(e.target);
                if(!$target.data('editable')) {
+                   //if delegated element initially empty, we need to clear it's text (that was manually set to `empty` by user)
+                   //see https://github.com/vitalets/x-editable/issues/137 
+                   if($target.hasClass(this.options.emptyclass)) {
+                      $target.empty();
+                   }
                    $target.editable(this.options).trigger(e);
                }
            }, this)); 
@@ -1530,7 +1548,7 @@ Makes editable any HTML element on the page. Applied as jQuery method.
             if(this.options.display === false) {
                 return;
             }
-            
+
             this.isEmpty = isEmpty !== undefined ? isEmpty : $.trim(this.$element.text()) === '';           
             
             //emptytext shown only for enabled
@@ -1751,11 +1769,14 @@ Makes editable any HTML element on the page. Applied as jQuery method.
             return result;
 
             /**
-            Returns current values of editable elements. If value is <code>null</code> or <code>undefined</code> it will not be returned
+            Returns current values of editable elements.   
+            Note that it returns an **object** with name-value pairs, not a value itself. It allows to get data from several elements.    
+            If value of some editable is `null` or `undefined` it is excluded from result object.  
+             
             @method getValue()
             @returns {Object} object of element names and values
             @example
-            $('#username, #fullname').editable('validate');
+            $('#username, #fullname').editable('getValue');
             // possible result:
             {
             username: "superuser",
@@ -1892,8 +1913,20 @@ Makes editable any HTML element on the page. Applied as jQuery method.
         **/          
         autotext: 'auto', 
         /**
-        Initial value of input. If not set, taken from element's text.
-
+        Initial value of input. If not set, taken from element's text.  
+        Note, that if element's text is empty - text is automatically generated from value and can be customized (see `autotext` option).  
+        For example, to display currency sign:
+        @example
+        <a id="price" data-type="text" data-value="100"></a>
+        <script>
+        $('#price').editable({
+            ...
+            display: function(value) {
+              $(this).text(value + '$');
+            } 
+        }) 
+        </script>
+                
         @property value 
         @type mixed
         @default element's text
@@ -1904,12 +1937,12 @@ Makes editable any HTML element on the page. Applied as jQuery method.
         If `null`, default input's display used.  
         If `false`, no displaying methods will be called, element's text will never change.  
         Runs under element's scope.  
-        _Parameters:_  
+        _**Parameters:**_  
         
         * `value` current value to be displayed
         * `response` server response (if display called after ajax submit), since 1.4.0
          
-        For **inputs with source** (select, checklist) parameters are different:  
+        For _inputs with source_ (select, checklist) parameters are different:  
           
         * `value` current value to be displayed
         * `sourceData` array of items for current input (e.g. dropdown items) 
@@ -1956,10 +1989,12 @@ Makes editable any HTML element on the page. Applied as jQuery method.
         **/        
         unsavedclass: 'editable-unsaved',
         /**
-        If a css selector is provided, editable will be delegated to the specified targets.  
+        If selector is provided, editable will be delegated to the specified targets.  
         Usefull for dynamically generated DOM elements.  
-        **Please note**, that delegated targets can't use `emptytext` and `autotext` options, 
-        as they are initialized after first click.    
+        **Please note**, that delegated targets can't be initialized with `emptytext` and `autotext` options, 
+        as they actually become editable only after first click.  
+        You should manually set class `editable-click` to these elements.  
+        Also, if element originally empty you should add class `editable-empty`, set `data-value=""` and write emptytext into element:
 
         @property selector 
         @type string
@@ -1967,8 +2002,10 @@ Makes editable any HTML element on the page. Applied as jQuery method.
         @default null
         @example
         <div id="user">
-          <a href="#" data-name="username" data-type="text" title="Username">awesome</a>
-          <a href="#" data-name="group" data-type="select" data-source="/groups" data-value="1" title="Group">Operator</a>
+          <!-- empty -->
+          <a href="#" data-name="username" data-type="text" class="editable-click editable-empty" data-value="" title="Username">Empty</a>
+          <!-- non-empty -->
+          <a href="#" data-name="group" data-type="select" data-source="/groups" data-value="1" class="editable-click" title="Group">Operator</a>
         </div>     
         
         <script>
@@ -2145,7 +2182,7 @@ To create your own input you can inherit from this class.
        },
        
        setAttr: function(attr) {
-           if (this.options[attr]) {
+           if (this.options[attr] !== undefined && this.options[attr] !== null) {
                this.$input.attr(attr, this.options[attr]);
            } 
        },
@@ -2172,7 +2209,10 @@ To create your own input you can inherit from this class.
         @type string
         @default input-medium
         **/         
-        inputclass: 'input-medium'
+        inputclass: 'input-medium',
+        //scope for external methods (e.g. source defined as function)
+        //for internal use only
+        scope: null
     };
     
     $.extend($.fn.editabletypes, {abstractinput: AbstractInput});
@@ -2251,12 +2291,19 @@ List - abstract class for inputs that have source option loaded from js array or
                 error.call(this);
                 return;
             }
+            
+            var source = this.options.source;
+            
+            //run source if it function
+            if ($.isFunction(source)) {
+                source = source.call(this.options.scope);
+            }
 
             //loading from url
-            if (typeof this.options.source === 'string') {
+            if (typeof source === 'string') {
                 //try to get from cache
                 if(this.options.sourceCache) {
-                    var cacheID = this.options.source,
+                    var cacheID = source,
                     cache;
 
                     if (!$(document).data(cacheID)) {
@@ -2289,7 +2336,7 @@ List - abstract class for inputs that have source option loaded from js array or
                 
                 //loading sourceData from server
                 $.ajax({
-                    url: this.options.source,
+                    url: source,
                     type: 'get',
                     cache: false,
                     dataType: 'json',
@@ -2324,12 +2371,8 @@ List - abstract class for inputs that have source option loaded from js array or
                         }
                     }, this)
                 });
-            } else { //options as json/array/function
-                if ($.isFunction(this.options.source)) {
-                   this.sourceData = this.makeArray(this.options.source());
-                } else {
-                   this.sourceData = this.makeArray(this.options.source);
-                }
+            } else { //options as json/array
+                this.sourceData = this.makeArray(source);
                     
                 if($.isArray(this.sourceData)) {
                     this.doPrepend();
@@ -2346,16 +2389,20 @@ List - abstract class for inputs that have source option loaded from js array or
             }
             
             if(!$.isArray(this.prependData)) {
+                //run prepend if it is function (once)
+                if ($.isFunction(this.options.prepend)) {
+                    this.options.prepend = this.options.prepend.call(this.options.scope);
+                }
+              
                 //try parse json in single quotes
                 this.options.prepend = $.fn.editableutils.tryParseJson(this.options.prepend, true);
+                
+                //convert prepend from string to object
                 if (typeof this.options.prepend === 'string') {
                     this.options.prepend = {'': this.options.prepend};
-                }              
-                if (typeof this.options.prepend === 'function') {
-                    this.prependData = this.makeArray(this.options.prepend());
-                } else {
-                    this.prependData = this.makeArray(this.options.prepend);
                 }
+                
+                this.prependData = this.makeArray(this.options.prepend);
             }
 
             if($.isArray(this.prependData) && $.isArray(this.sourceData)) {
@@ -2536,8 +2583,20 @@ $(function(){
            if (this.options.clear) {
                this.$clear = $('<span class="editable-clear-x"></span>');
                this.$input.after(this.$clear)
-                          .css('padding-right', 20)
-                          .keyup($.proxy(this.toggleClear, this))
+                          .css('padding-right', 24)
+                          .keyup($.proxy(function(e) {
+                              //arrows, enter, tab, etc
+                              if(~$.inArray(e.keyCode, [40,38,9,13,27])) {
+                                return;
+                              }                            
+
+                              clearTimeout(this.t);
+                              var that = this;
+                              this.t = setTimeout(function() {
+                                that.toggleClear(e);
+                              }, 100);
+                              
+                          }, this))
                           .parent().css('position', 'relative');
                           
                this.$clear.click($.proxy(this.clear, this));                       
@@ -2555,19 +2614,24 @@ $(function(){
                    delta = 3; 
                 }
                     
-                this.$clear.css({top: delta, right: delta});
+                this.$clear.css({bottom: delta, right: delta});
             } 
         },
         
         //show / hide clear button
-        toggleClear: function() {
+        toggleClear: function(e) {
             if(!this.$clear) {
                 return;
             }
             
-            if(this.$input.val().length) {
+            var len = this.$input.val().length,
+                visible = this.$clear.is(':visible');
+                 
+            if(len && !visible) {
                 this.$clear.show();
-            } else {
+            } 
+            
+            if(!len && visible) {
                 this.$clear.hide();
             } 
         },
@@ -2733,7 +2797,6 @@ $(function(){
               {value: 2, text: 'Blocked'},
               {value: 3, text: 'Deleted'}
            ]
-        }
     });
 });
 </script>
@@ -2803,7 +2866,8 @@ $(function(){
 
     $.fn.editabletypes.select = Select;      
 
-}(window.jQuery));
+}(window.jQuery));
+
 /**
 List of checkboxes. 
 Internally value stored as javascript array of values.
@@ -2822,7 +2886,6 @@ $(function(){
               {value: 2, text: 'option2'},
               {value: 3, text: 'option3'}
            ]
-        }
     });
 });
 </script>
@@ -3132,6 +3195,9 @@ You should manually include select2 distributive:
     <link href="select2/select2.css" rel="stylesheet" type="text/css"></link>  
     <script src="select2/select2.js"></script>  
     
+**Note:** currently `ajax` source for select2 is not supported, as it's not possible to load it in closed select2 state.  
+The solution is to load source manually and assign statically.    
+    
 @class select2
 @extends abstractinput
 @since 1.4.1
@@ -3161,14 +3227,14 @@ $(function(){
         options.select2 = options.select2 || {};
         
         var that = this, 
-            mixin = {
+            mixin = {    //mixin to select2 options
                placeholder:  options.placeholder
             };
        
        //detect whether it is multi-valued
        this.isMultiple = options.select2.tags || options.select2.multiple;
        
-       //if not `tags` mode, we need define init set data from source
+       //if not `tags` mode, we need define initSelection to set data from source
        if(!options.select2.tags) {
             if(options.source) {
                 mixin.data = options.source;
@@ -3176,6 +3242,23 @@ $(function(){
 
             //this function can be defaulted in seletc2. See https://github.com/ivaynberg/select2/issues/710
             mixin.initSelection = function (element, callback) {
+                //temp: try update results
+                /*
+                if(options.select2 && options.select2.ajax) {
+                  console.log('attached');
+                  var original =  $(element).data('select2').postprocessResults;
+                  console.log(original);
+                  $(element).data('select2').postprocessResults = function(data, initial) {
+                    console.log('postprocess');
+                   // this.element.triggerHandler('loaded', [data]);
+                    original.apply(this, arguments);  
+                  }                  
+
+               //   $(element).on('loaded', function(){console.log('loaded');});
+                  $(element).data('select2').updateResults(true);
+                }
+                */
+              
                 var val = that.str2value(element.val()),
                     data = $.fn.editableutils.itemsByValue(val, mixin.data, 'id');
                 
@@ -3200,18 +3283,30 @@ $(function(){
             //apply select2
             this.$input.select2(this.options.select2);
 
+            //when data is loaded via ajax, we need to know when it's done
+            if('ajax' in this.options.select2) {
+              /*
+              console.log('attached');
+              var original = this.$input.data('select2').postprocessResults;
+              this.$input.data('select2').postprocessResults = function(data, initial) {
+                  this.element.triggerHandler('loaded', [data]);
+                  original.apply(this, arguments);  
+              }
+              */
+            }
+                         
+
             //trigger resize of editableform to re-position container in multi-valued mode           
             if(this.isMultiple) {
                this.$input.on('change', function() {
                    $(this).closest('form').parent().triggerHandler('resize');
                }); 
-            }            
-            
-        },
+            } 
+       },
        
        value2html: function(value, element) {
            var text = '', data;
-           if(this.$input) { //when submitting form 
+           if(this.$input) { //called when submitting form and select2 already exists 
                data = this.$input.select2('data');
            } else { //on init (autotext)
                //here select2 instance not created yet and data may be even not loaded.
@@ -3220,6 +3315,8 @@ $(function(){
                    data = value;
                } else if(this.options.select2.data) {
                    data = $.fn.editableutils.itemsByValue(value, this.options.select2.data, 'id');   
+               } else {
+                   //if('ajax' in this.options.select2) {
                }
            }
            
@@ -3243,7 +3340,7 @@ $(function(){
        }, 
        
        value2input: function(value) {
-           this.$input.val(value).trigger('change');
+           this.$input.val(value).trigger('change', true); //second argument needed to separate initial change from user's click (for autosubmit)
        },
        
        input2value: function() { 
@@ -3268,7 +3365,15 @@ $(function(){
             }
             
             return val;
-       }        
+       },
+       
+        autosubmit: function() {
+            this.$input.on('change', function(e, isInitial){
+                if(!isInitial) {
+                  $(this).closest('form').submit();
+                }
+            });
+        }               
         
     });      
 
@@ -3318,7 +3423,7 @@ $(function(){
     
 }(window.jQuery));
 /**
-* Combodate - 1.0.1
+* Combodate - 1.0.2
 * Dropdown date and time picker.
 * Converts text input into dropdowns to pick day, month, year, hour, minute and second.
 * Uses momentjs as datetime library http://momentjs.com.
@@ -3421,9 +3526,13 @@ $(function(){
          Initialize items of combos. Handles `firstItem` option 
         */
         initItems: function(key) {
-            var values = [];
+            var values = [],
+                relTime;
+                
             if(this.options.firstItem === 'name') {
-                var header = typeof moment.relativeTime[key] === 'function' ? moment.relativeTime[key](1, true, key, false) : moment.relativeTime[key];
+                //need both to suuport moment ver < 2 and  >= 2
+                relTime = moment.relativeTime || moment.langData()._relativeTime; 
+                var header = typeof relTime[key] === 'function' ? relTime[key](1, true, key, false) : relTime[key];
                 //take last entry (see momentjs lang files structure) 
                 header = header.split(' ').reverse()[0];                
                 values.push(['', header]);
@@ -3469,9 +3578,9 @@ $(function(){
                 
             for(i=0; i<=11; i++) {
                 if(longNames) {
-                    name = moment.months[i];
+                    name = moment().month(i).format('MMMM');
                 } else if(shortNames) {
-                    name = moment.monthsShort[i];
+                    name = moment().month(i).format('MMM');
                 } else if(twoDigit) {
                     name = this.leadZero(i+1);
                 } else {
@@ -3717,7 +3826,7 @@ $(function(){
 }(window.jQuery));
 /**
 Combodate input - dropdown date and time picker.    
-Based on [combodate](http://vitalets.github.com/combodate) plugin. To use it you should manually include [momentjs](http://momentjs.com).
+Based on [combodate](http://vitalets.github.com/combodate) plugin (included). To use it you should manually include [momentjs](http://momentjs.com).
 
     <script src="js/moment.min.js"></script>
    
@@ -3765,6 +3874,9 @@ $(function(){
             this.options.viewformat = this.options.format;
         }        
         
+        //try parse combodate config defined as json string in data-combodate
+        options.combodate = $.fn.editableutils.tryParseJson(options.combodate, true);
+
         //overriding combodate config (as by default jQuery extend() is not recursive)
         this.options.combodate = $.extend({}, Constructor.defaults.combodate, options.combodate, {
             format: this.options.format,
@@ -4149,12 +4261,24 @@ $(function(){
        },
        
        autosubmit: function() {
+           this.$input.on('mouseup', '.day', function(e){
+               if($(e.currentTarget).is('.old') || $(e.currentTarget).is('.new')) {
+                 return;
+               }
+               var $form = $(this).closest('form');
+               setTimeout(function() {
+                   $form.submit();
+               }, 200);
+           });
+           //changedate is not suitable as it triggered when showing datepicker. see #149
+           /*
            this.$input.on('changeDate', function(e){
                var $form = $(this).closest('form');
                setTimeout(function() {
                    $form.submit();
                }, 200);
            });
+           */
        }
 
     });
@@ -4197,12 +4321,14 @@ $(function(){
         @default {
             weekStart: 0,
             startView: 0,
+            minViewMode: 0,
             autoclose: false
         }
         **/
         datepicker:{
             weekStart: 0,
             startView: 0,
+            minViewMode: 0,
             autoclose: false
         },
         /**
@@ -4291,6 +4417,7 @@ Automatically shown in inline mode.
         datepicker: {
             weekStart: 0,
             startView: 0,
+            minViewMode: 0,
             autoclose: true
         }
     });
@@ -4335,9 +4462,10 @@ Automatically shown in inline mode.
 
 		this.element = $(element);
 		this.language = options.language||this.element.data('date-language')||"en";
+		this.language = this.language in dates ? this.language : this.language.split('-')[0]; //Check if "de-DE" style date is available, if not language should fallback to 2 letter code eg "de"
 		this.language = this.language in dates ? this.language : "en";
 		this.isRTL = dates[this.language].rtl||false;
-		this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||'mm/dd/yyyy');
+		this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||dates[this.language].format||'mm/dd/yyyy');
 		this.isInline = false;
 		this.isInput = this.element.is('input');
 		this.component = this.element.is('.date') ? this.element.find('.add-on') : false;
@@ -4353,7 +4481,7 @@ Automatically shown in inline mode.
 		} else if ('dateForceParse' in this.element.data()) {
 			this.forceParse = this.element.data('date-force-parse');
 		}
-		 
+
 
 		this.picker = $(DPGlobal.template)
 							.appendTo(this.isInline ? this.element : 'body')
@@ -4374,7 +4502,7 @@ Automatically shown in inline mode.
 		}
 		$(document).on('mousedown', function (e) {
 			// Clicked outside the datepicker, hide it
-			if ($(e.target).closest('.datepicker').length === 0) {
+			if ($(e.target).closest('.datepicker.datepicker-inline, .datepicker.datepicker-dropdown').length === 0) {
 				that.hide();
 			}
 		});
@@ -4405,9 +4533,38 @@ Automatically shown in inline mode.
 				break;
 		}
 
+		this.minViewMode = options.minViewMode||this.element.data('date-min-view-mode')||0;
+		if (typeof this.minViewMode === 'string') {
+			switch (this.minViewMode) {
+				case 'months':
+					this.minViewMode = 1;
+					break;
+				case 'years':
+					this.minViewMode = 2;
+					break;
+				default:
+					this.minViewMode = 0;
+					break;
+			}
+		}
+
+		this.viewMode = this.startViewMode = Math.max(this.startViewMode, this.minViewMode);
+
 		this.todayBtn = (options.todayBtn||this.element.data('date-today-btn')||false);
 		this.todayHighlight = (options.todayHighlight||this.element.data('date-today-highlight')||false);
 
+		this.calendarWeeks = false;
+		if ('calendarWeeks' in options) {
+			this.calendarWeeks = options.calendarWeeks;
+		} else if ('dateCalendarWeeks' in this.element.data()) {
+			this.calendarWeeks = this.element.data('date-calendar-weeks');
+		}
+		if (this.calendarWeeks)
+			this.picker.find('tfoot th.today')
+						.attr('colspan', function(i, val){
+							return parseInt(val) + 1;
+						});
+
 		this.weekStart = ((options.weekStart||this.element.data('date-weekstart')||dates[this.language].weekStart||0) % 7);
 		this.weekEnd = ((this.weekStart + 6) % 7);
 		this.startDate = -Infinity;
@@ -4497,6 +4654,7 @@ Automatically shown in inline mode.
 
 		hide: function(e){
 			if(this.isInline) return;
+			if (!this.picker.is(':visible')) return;
 			this.picker.hide();
 			$(window).off('resize', this.place);
 			this.viewMode = this.startViewMode;
@@ -4618,7 +4776,6 @@ Automatically shown in inline mode.
 
 			if(fromArgs) this.setValue();
 
-			var oldViewDate = this.viewDate;
 			if (this.date < this.startDate) {
 				this.viewDate = new Date(this.startDate);
 			} else if (this.date > this.endDate) {
@@ -4626,19 +4783,17 @@ Automatically shown in inline mode.
 			} else {
 				this.viewDate = new Date(this.date);
 			}
-
-			if (oldViewDate && oldViewDate.getTime() != this.viewDate.getTime()){
-				this.element.trigger({
-					type: 'changeDate',
-					date: this.viewDate
-				});
-			}
 			this.fill();
 		},
 
 		fillDow: function(){
 			var dowCnt = this.weekStart,
 			html = '<tr>';
+			if(this.calendarWeeks){
+				var cell = '<th class="cw">&nbsp;</th>';
+				html += cell;
+				this.picker.find('.datepicker-days thead tr:first-child').prepend(cell);
+			}
 			while (dowCnt < this.weekStart + 7) {
 				html += '<th class="dow">'+dates[this.language].daysMin[(dowCnt++)%7]+'</th>';
 			}
@@ -4665,7 +4820,7 @@ Automatically shown in inline mode.
 				endMonth = this.endDate !== Infinity ? this.endDate.getUTCMonth() : Infinity,
 				currentDate = this.date && this.date.valueOf(),
 				today = new Date();
-			this.picker.find('.datepicker-days thead th:eq(1)')
+			this.picker.find('.datepicker-days thead th.switch')
 						.text(dates[this.language].months[month]+' '+year);
 			this.picker.find('tfoot th.today')
 						.text(dates[this.language].today)
@@ -4684,6 +4839,21 @@ Automatically shown in inline mode.
 			while(prevMonth.valueOf() < nextMonth) {
 				if (prevMonth.getUTCDay() == this.weekStart) {
 					html.push('<tr>');
+					if(this.calendarWeeks){
+						// ISO 8601: First week contains first thursday.
+						// ISO also states week starts on Monday, but we can be more abstract here.
+						var
+							// Start of current week: based on weekstart/current date
+							ws = new Date(+prevMonth + (this.weekStart - prevMonth.getUTCDay() - 7) % 7 * 864e5),
+							// Thursday of this week
+							th = new Date(+ws + (7 + 4 - ws.getUTCDay()) % 7 * 864e5),
+							// First Thursday of year, year from thursday
+							yth = new Date(+(yth = UTCDate(th.getUTCFullYear(), 0, 1)) + (7 + 4 - yth.getUTCDay())%7*864e5),
+							// Calendar week: ms between thursdays, div ms per day, div 7 days
+							calWeek =  (th - yth) / 864e5 / 7 + 1;
+						html.push('<td class="cw">'+ calWeek +'</td>');
+
+					}
 				}
 				clsName = '';
 				if (prevMonth.getUTCFullYear() < year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() < month)) {
@@ -4819,19 +4989,29 @@ Automatically shown in inline mode.
 						if (!target.is('.disabled')) {
 							this.viewDate.setUTCDate(1);
 							if (target.is('.month')) {
+								var day = 1;
 								var month = target.parent().find('span').index(target);
+								var year = this.viewDate.getUTCFullYear();
 								this.viewDate.setUTCMonth(month);
 								this.element.trigger({
 									type: 'changeMonth',
 									date: this.viewDate
 								});
+								if ( this.minViewMode == 1 ) {
+									this._setDate(UTCDate(year, month, day,0,0,0,0));
+								}
 							} else {
 								var year = parseInt(target.text(), 10)||0;
+								var day = 1;
+								var month = 0;
 								this.viewDate.setUTCFullYear(year);
 								this.element.trigger({
 									type: 'changeYear',
 									date: this.viewDate
 								});
+								if ( this.minViewMode == 2 ) {
+									this._setDate(UTCDate(year, month, day,0,0,0,0));
+								}
 							}
 							this.showMode(-1);
 							this.fill();
@@ -5028,7 +5208,7 @@ Automatically shown in inline mode.
 
 		showMode: function(dir) {
 			if (dir) {
-				this.viewMode = Math.max(0, Math.min(2, this.viewMode + dir));
+				this.viewMode = Math.max(this.minViewMode, Math.min(2, this.viewMode + dir));
 			}
 			/*
 				vitalets: fixing bug of very special conditions:
@@ -5288,7 +5468,6 @@ $(function(){
               {value: 'us', text: 'United States'},
               {value: 'ru', text: 'Russia'}
            ]
-        }
     });
 });
 </script>
@@ -5320,8 +5499,11 @@ $(function(){
             //apply typeahead
             this.$input.typeahead(this.options.typeahead);
             
-            //attach own render method
-            this.$input.data('typeahead').render = $.proxy(this.typeaheadRender, this.$input.data('typeahead'));
+            //patch some methods in typeahead
+            var ta = this.$input.data('typeahead');
+            ta.render = $.proxy(this.typeaheadRender, ta);
+            ta.select = $.proxy(this.typeaheadSelect, ta);
+            ta.move = $.proxy(this.typeaheadMove, ta);
 
             this.renderClear();
             this.setClass();
@@ -5400,7 +5582,7 @@ $(function(){
         /*
           Typeahead option methods used as defaults
         */
-        /*jshint eqeqeq:false, curly: false, laxcomma: true*/
+        /*jshint eqeqeq:false, curly: false, laxcomma: true, asi: true*/
         matcher: function (item) {
             return $.fn.typeahead.Constructor.prototype.matcher.call(this, item.text);
         },
@@ -5424,7 +5606,6 @@ $(function(){
             return $.fn.typeahead.Constructor.prototype.highlighter.call(this, item.text);
         },
         updater: function (item) {
-            item = this.$menu.find('.active').data('item');
             this.$element.data('value', item.value);
             return item.text;
         },  
@@ -5435,7 +5616,7 @@ $(function(){
           There are a lot of disscussion in bootstrap repo on this point and still no result.
           See https://github.com/twitter/bootstrap/issues/5967 
           
-          This function just store item in via jQuery data() method instead of attr('data-value')
+          This function just store item via jQuery data() method instead of attr('data-value')
         */        
         typeaheadRender: function (items) {
             var that = this;
@@ -5447,11 +5628,57 @@ $(function(){
                 return i[0];
             });
 
-            items.first().addClass('active');
+            //add option to disable autoselect of first line
+            //see https://github.com/twitter/bootstrap/pull/4164 
+            if (this.options.autoSelect) {
+              items.first().addClass('active');
+            }
             this.$menu.html(items);
             return this;
+        },
+       
+        //add option to disable autoselect of first line
+        //see https://github.com/twitter/bootstrap/pull/4164         
+        typeaheadSelect: function () {
+          var val = this.$menu.find('.active').data('item')
+          if(this.options.autoSelect || val){
+            this.$element
+            .val(this.updater(val))
+            .change()
+          }
+          return this.hide()
+        },
+        
+        /*
+         if autoSelect = false and nothing matched we need extra press onEnter that is not convinient.
+         This patch fixes it.
+        */
+        typeaheadMove: function (e) {
+          if (!this.shown) return
+
+          switch(e.keyCode) {
+            case 9: // tab
+            case 13: // enter
+            case 27: // escape
+              if (!this.$menu.find('.active').length) return
+              e.preventDefault()
+              break
+
+            case 38: // up arrow
+              e.preventDefault()
+              this.prev()
+              break
+
+            case 40: // down arrow
+              e.preventDefault()
+              this.next()
+              break
+          }
+
+          e.stopPropagation()
         }
-        /*jshint eqeqeq: true, curly: true, laxcomma: false*/  
+        
+        /*jshint eqeqeq: true, curly: true, laxcomma: false, asi: false*/  
         
     });