Merge remote-tracking branch 'origin/CDB-2006' into release/2.11.1

Conflicts:
	vendor/assets/javascripts/cartodb.uncompressed.js

lib/assets/javascripts/cartodb/table/menu_modules/infowindow/infowindow_fields_pane.js

@@ -140,8 +140,14 @@
         return pos_a - pos_b;
       });
 
-      _(names).each(function(f) {
-        var v = new cdb.admin.mod.InfowindowField({ model: self.model,  field: f , position: self.model.getFieldPos(f) });
+      _(names).each(function(f, i) {
+        // when there are no fields selected sort using the view list position
+        var pos = self.model.fieldCount() ?  self.model.getFieldPos(f): i;
+        var v = new cdb.admin.mod.InfowindowField({
+          model: self.model,
+          field: f,
+          position: pos
+        });
         self.addView(v);
         $f.append(v.render().el);
       });

lib/assets/test/spec/cartodb/table/menu_modules/infowindow.spec.js

@@ -121,6 +121,7 @@ describe("mod.infowindow", function() {
 
     beforeEach(function() {
       model = new cdb.geo.ui.InfowindowModel();
+      model.clearFields();
       table = new cdb.admin.CartoDBTableMetadata({
           name: 'testTable',
           schema: [
@@ -165,6 +166,15 @@ describe("mod.infowindow", function() {
       expect($(view.$el.find('.selectall')[0]).hasClass('disabled')).toEqual(true);
     });
 
+    it("should assign fileds positions when there are no fields selected", function() {
+      view.render();
+      var i = 0;
+      _.each(view._subviews, function(v) {
+        expect(v.position).toEqual(i)
+        ++i;
+      });
+    });
+
     it("should toggle titles", function() {
       view.render();
       model.addField('name1').addField('name2');

vendor/assets/javascripts/cartodb.uncompressed.js

@@ -1,6 +1,6 @@
 // cartodb.js version: 3.8.03-dev
 // uncompressed version: cartodb.uncompressed.js
-// sha: b9701b30f4964d55c278dea2aa9d7112f4b85b1a
+// sha: ea4e83f59980dc0294eb577ba67323580532aa60
 (function() {
   var root = this;
 
@@ -24273,7 +24273,9 @@ cdb.geo.ui.InfowindowModel = Backbone.Model.extend({
   },
 
   fieldCount: function() {
-    return this.get('fields').length
+    var fields = this.get('fields')
+    if (!fields) return 0;
+    return fields.length
   },
 
   restoreFields: function(whiteList, from) {