From bda32418de3ca5b6082f97a36b7590bc27937287 Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 15 May 2014 17:26:22 +0800 Subject: [PATCH] buildSDK/dependancy_bootstrap.txt roojs-bootstrap.js roojs-bootstrap-debug.js --- buildSDK/dependancy_bootstrap.txt | 4 - roojs-bootstrap-debug.js | 928 +----------------------------- roojs-bootstrap.js | 15 +- 3 files changed, 4 insertions(+), 943 deletions(-) diff --git a/buildSDK/dependancy_bootstrap.txt b/buildSDK/dependancy_bootstrap.txt index 3779667d32..593eaaa72b 100644 --- a/buildSDK/dependancy_bootstrap.txt +++ b/buildSDK/dependancy_bootstrap.txt @@ -74,7 +74,3 @@ Roo.bootstrap.HtmlEditor Roo.bootstrap.Table.AbstractSelectionModel Roo.bootstrap.Table.ColumnModel Roo.bootstrap.Table.RowSelectionModel - - -Roo.Toolbar -Roo.PagingToolbar diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 76665df454..770cb960ea 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -7371,6 +7371,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, { this.pageTb = new Roo.Toolbar(this.footer); } + */ if(this.pageSize){ this.footer = this.list.createChild({cls:cls+'-ft'}); this.pageTb = new Roo.PagingToolbar(this.footer, this.store, @@ -7394,7 +7395,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, { if (this.footer) { this.assetHeight += this.footer.getHeight(); } - */ + if(!this.tpl){ this.tpl = '
  • {' + this.displayField + '}
  • '; @@ -12383,929 +12384,4 @@ Roo.extend(Roo.bootstrap.Table.RowSelectionModel, Roo.bootstrap.Table.AbstractSe g.startEditing(newCell[0], newCell[1]); } } -});/* - * Based on: - * Ext JS Library 1.1.1 - * Copyright(c) 2006-2007, Ext JS, LLC. - * - * Originally Released Under LGPL - original licence link has changed is not relivant. - * - * Fork - LGPL - *