From bb660b22a6e7b689a0c8a3f52eda5f28ae3809c0 Mon Sep 17 00:00:00 2001 From: Matt Bertrand Date: Fri, 15 May 2015 15:54:27 -0400 Subject: [PATCH] Use original Ext.ux namespace for Spinner, SpinnerField classes --- src/script/spinner/Spinner.js | 10 +++++----- src/script/spinner/SpinnerField.js | 10 +++++----- src/script/widgets/ClassificationPanel.js | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/script/spinner/Spinner.js b/src/script/spinner/Spinner.js index 35c19ee6..bc2738d8 100644 --- a/src/script/spinner/Spinner.js +++ b/src/script/spinner/Spinner.js @@ -19,14 +19,14 @@ Build date: 2013-04-03 15:07:25 */ -Ext.namespace("gxp"); +Ext.ns('Ext.ux'); /** - * @class gxp.Spinner + * @class Ext.ux.Spinner * @extends Ext.util.Observable - * Creates a Spinner control utilized by gxp.SpinnerField + * Creates a Spinner control utilized by Ext.ux.form.SpinnerField */ -gxp.Spinner = Ext.extend(Ext.util.Observable, { +Ext.ux.Spinner = Ext.extend(Ext.util.Observable, { incrementValue: 1, alternateIncrementValue: 5, triggerClass: 'x-form-spinner-trigger', @@ -36,7 +36,7 @@ gxp.Spinner = Ext.extend(Ext.util.Observable, { accelerate: false, constructor: function(config){ - gxp.Spinner.superclass.constructor.call(this, config); + Ext.ux.Spinner.superclass.constructor.call(this, config); Ext.apply(this, config); this.mimicing = false; }, diff --git a/src/script/spinner/SpinnerField.js b/src/script/spinner/SpinnerField.js index 3921ac30..234a7776 100644 --- a/src/script/spinner/SpinnerField.js +++ b/src/script/spinner/SpinnerField.js @@ -19,7 +19,7 @@ Build date: 2013-04-03 15:07:25 */ -Ext.namespace("gxp"); +Ext.ns('Ext.ux.form'); /** * @class Ext.ux.form.SpinnerField @@ -27,7 +27,7 @@ Ext.namespace("gxp"); * Creates a field utilizing Ext.ux.Spinner * @xtype spinnerfield */ -gxp.SpinnerField = Ext.extend(Ext.form.NumberField, { +Ext.ux.form.SpinnerField = Ext.extend(Ext.form.NumberField, { actionMode: 'wrap', deferHeight: true, autoSize: Ext.emptyFn, @@ -37,7 +37,7 @@ gxp.SpinnerField = Ext.extend(Ext.form.NumberField, { constructor: function(config) { var spinnerConfig = Ext.copyTo({}, config, 'incrementValue,alternateIncrementValue,accelerate,defaultValue,triggerClass,splitterClass'); - var spl = this.spinner = new gxp.Spinner(spinnerConfig); + var spl = this.spinner = new Ext.ux.Spinner(spinnerConfig); var plugins = config.plugins ? (Ext.isArray(config.plugins) @@ -45,7 +45,7 @@ gxp.SpinnerField = Ext.extend(Ext.form.NumberField, { : [config.plugins, spl]) : spl; - gxp.SpinnerField.superclass.constructor.call(this, Ext.apply(config, {plugins: plugins})); + Ext.ux.form.SpinnerField.superclass.constructor.call(this, Ext.apply(config, {plugins: plugins})); }, // private @@ -70,5 +70,5 @@ gxp.SpinnerField = Ext.extend(Ext.form.NumberField, { } }); -Ext.reg('spinnerfield', gxp.SpinnerField); +Ext.reg('spinnerfield', Ext.ux.form.SpinnerField); diff --git a/src/script/widgets/ClassificationPanel.js b/src/script/widgets/ClassificationPanel.js index 537cf2b5..d93d8313 100644 --- a/src/script/widgets/ClassificationPanel.js +++ b/src/script/widgets/ClassificationPanel.js @@ -94,7 +94,7 @@ gxp.ClassificationPanel = Ext.extend(Ext.Panel, { - var classNumSelector = new gxp.SpinnerField({ + var classNumSelector = new Ext.ux.form.SpinnerField({ fieldLabel: 'Classes', id: "choropleth_classes", minValue: 2,