From: Alan Knowles <alan@roojs.com>
Date: Fri, 8 May 2020 08:43:10 +0000 (+0800)
Subject: sync
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=5b1a708cf006e24f8f6eb81a4e9723dad77c31cd;hp=-c

sync
---

5b1a708cf006e24f8f6eb81a4e9723dad77c31cd
diff --combined docs/src/Roo_grid_Grid.js.html
index 93dfadbefb,351d32c22c..5a50968cd0
--- a/docs/src/Roo_grid_Grid.js.html
+++ b/docs/src/Roo_grid_Grid.js.html
@@@ -484,12 -484,12 +484,12 @@@
          </span><span class="jsdoc-keyword">return </span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">;
      },
  
- 	</span><span class="jsdoc-comment">/**
- 	 * Reconfigures the grid to use a different Store and Column Model.
- 	 * The View will be bound to the new objects and refreshed.
- 	 * @param {Roo.data.Store} dataSource The new {@link Roo.data.Store} object
- 	 * @param {Roo.grid.ColumnModel} The new {@link Roo.grid.ColumnModel} object
- 	 */
+     </span><span class="jsdoc-comment">/**
+      * Reconfigures the grid to use a different Store and Column Model.
+      * The View will be bound to the new objects and refreshed.
+      * @param {Roo.data.Store} dataSource The new {@link Roo.data.Store} object
+      * @param {Roo.grid.ColumnModel} The new {@link Roo.grid.ColumnModel} object
+      */
      </span><span class="jsdoc-var">reconfigure </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">dataSource</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">colModel</span><span class="jsdoc-syntax">){
          </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.loadMask</span><span class="jsdoc-syntax">){
              </span><span class="jsdoc-var">this.loadMask.destroy</span><span class="jsdoc-syntax">();
@@@ -522,9 -522,9 +522,9 @@@
              </span><span class="jsdoc-var">pos </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.cm.config.length</span><span class="jsdoc-syntax">; </span><span class="jsdoc-comment">//this.cm.config.push(cfg);
          </span><span class="jsdoc-syntax">}
          </span><span class="jsdoc-var">pos </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">Math.max</span><span class="jsdoc-syntax">(0,</span><span class="jsdoc-var">pos</span><span class="jsdoc-syntax">);
 -        </span><span class="jsdoc-var">ar.shift</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">ar.length</span><span class="jsdoc-syntax">);
 -        </span><span class="jsdoc-var">ar.shift</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">pos</span><span class="jsdoc-syntax">);
 -        </span><span class="jsdoc-var">this.cm.config.splice.call</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">ar</span><span class="jsdoc-syntax">);
 +        </span><span class="jsdoc-var">ar.unshift</span><span class="jsdoc-syntax">(0);
 +        </span><span class="jsdoc-var">ar.unshift</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">pos</span><span class="jsdoc-syntax">);
 +        </span><span class="jsdoc-var">this.cm.config.splice.apply</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.cm.config</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">ar</span><span class="jsdoc-syntax">);
  
  
  
@@@ -757,4 -757,4 +757,4 @@@
   * %0 is replaced with the number of selected rows.
   * @type String
   */
 -</span><span class="jsdoc-var">Roo.grid.Grid.prototype.ddText </span><span class="jsdoc-syntax">= </span><span class="jsdoc-string">&quot;{0} selected row{1}&quot;</span><span class="jsdoc-syntax">;</span></code></body></html>
 +</span><span class="jsdoc-var">Roo.grid.Grid.prototype.ddText </span><span class="jsdoc-syntax">= </span><span class="jsdoc-string">&quot;{0} selected row{1}&quot;</span><span class="jsdoc-syntax">;</span></code></body></html>