Merge pull request #726 from djhvscf/master

Improve the flatJSON

src/extensions/flatJSON/bootstrap-table-flatJSON.js

@@ -1,37 +1,10 @@
 /**
- * bootstrap-table-flatJSON.js
- * @version: v1.0.1
  * @author: Dennis Hernández
  * @webSite: http://djhvscf.github.io/Blog
- *
- * Created by Dennis Hernández on 01/Nov/2014.
- *
- * Copyright (c) 2014 Dennis Hernández http://djhvscf.github.io/Blog
- *
- * The MIT License (http://www.opensource.org/licenses/mit-license.php)
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
+ * @version: v1.1.0
  */
 
+
 (function ($) {
     'use strict';
 
@@ -51,11 +24,11 @@
     var BootstrapTable = $.fn.bootstrapTable.Constructor,
         _initData = BootstrapTable.prototype.initData,
         _init = BootstrapTable.prototype.init,
-        _load = BootstrapTable.prototype.load;
+        _initTable = BootstrapTable.prototype.initTable;
 
-    BootstrapTable.prototype.initData = function () {
-        flatJSON(this, this.options.data);
+    BootstrapTable.prototype.initData = function (data) {
         _initData.apply(this, Array.prototype.slice.apply(arguments));
+        flatJSON(this, data === undefined ? this.options.data : data);
     };
 
     BootstrapTable.prototype.init = function () {
@@ -63,9 +36,9 @@
         _init.apply(this, Array.prototype.slice.apply(arguments));
     };
 
-    BootstrapTable.prototype.load = function (data) {
+    BootstrapTable.prototype.initTable = function () {
         flatJSON(this, this.options.data);
-        _load.apply(this, Array.prototype.slice.apply(arguments));
+        _initTable.apply(this, Array.prototype.slice.apply(arguments));
     };
 
     //Main functions

src/extensions/mobile/bootstrap-table-mobile.js

@@ -17,15 +17,15 @@
     var changeView = function (el, width, height) {
         if (el.options.minHeight) {
             if (checkValuesLessEqual(width, el.options.minWidth) && checkValuesLessEqual(height, el.options.minHeight)) {
-                checkToggledStatus(false, true, el);
+                conditionCardView(el);
             } else if (checkValuesGreater(width, el.options.minWidth) && checkValuesGreater(height, el.options.minHeight)) {
-                checkToggledStatus(true, false, el);
+                conditionFullView(el);
             }
         } else {
             if (checkValuesLessEqual(width, el.options.minWidth)) {
-                checkToggledStatus(false, true, el);
+                conditionCardView(el);
             } else if (checkValuesGreater(width, el.options.minWidth)) {
-                checkToggledStatus(true, false, el);
+                conditionFullView(el);
             }
         }
 
@@ -40,11 +40,14 @@
         return currentValue > targetValue;
     };
 
-    var checkToggledStatus = function (targetToggledStatus, newToggledStatus, el) {
-        if (el.options.toggled === targetToggledStatus) {
-            el.toggleView();
-            el.options.toggled = newToggledStatus;
-        }
+    var conditionCardView = function (el) {
+        el.options.cardView = false;
+        el.toggleView();
+    };
+
+    var conditionFullView = function (el) {
+        el.options.cardView = true;
+        el.toggleView();
     };
 
     $.extend($.fn.bootstrapTable.defaults, {