Merge pull request #3624 from lowegreg/develop

Update cardView toggle icon swap

src/bootstrap-table.js

@@ -22,7 +22,8 @@
                 paginationSwitchDown: 'glyphicon-collapse-down icon-chevron-down',
                 paginationSwitchUp: 'glyphicon-collapse-up icon-chevron-up',
                 refresh: 'glyphicon-refresh icon-refresh',
-                toggle: 'glyphicon-list-alt icon-list-alt',
+                toggleOff: 'glyphicon-list-alt icon-list-alt',
+                toggleOn: 'glyphicon-list-alt icon-list-alt',
                 columns: 'glyphicon-th icon-th',
                 detailOpen: 'glyphicon-plus icon-plus',
                 detailClose: 'glyphicon-minus icon-minus',
@@ -41,7 +42,8 @@
                 paginationSwitchDown: 'fa-toggle-down',
                 paginationSwitchUp: 'fa-toggle-up',
                 refresh: 'fa-refresh',
-                toggle: 'fa-toggle-on',
+                toggleOff: 'fa-toggle-off',
+                toggleOn: 'fa-toggle-on',
                 columns: 'fa-th-list',
                 detailOpen: 'fa-plus',
                 detailClose: 'fa-minus',
@@ -3095,6 +3097,14 @@
         this.initHeader();
         // Fixed remove toolbar when click cardView button.
         //that.initToolbar();
+        var $icon = this.$toolbar.find('button[name="toggle"] i');
+        if (this.options.cardView) {
+            $icon.removeClass(this.options.icons.toggleOff);
+            $icon.addClass(this.options.icons.toggleOn);
+        } else {
+            $icon.removeClass(this.options.icons.toggleOn);
+            $icon.addClass(this.options.icons.toggleOff);
+        }
         this.initBody();
         this.trigger('toggle', this.options.cardView);
     };

src/extensions/i18n-enhance/bootstrap-table-i18n-enhance.js

@@ -16,7 +16,6 @@
         }
       });
     });
-
     this.initHeader();
     this.initBody();
     this.initToolbar();
@@ -26,9 +25,11 @@
     this.options.locale = localeId;
     this.initLocale();
     this.initPagination();
+    this.initBody();
+    this.initToolbar();
   };
 
   $.fn.bootstrapTable.methods.push('changeTitle');
   $.fn.bootstrapTable.methods.push('changeLocale');
 
-}(jQuery);
+}(jQuery);