Skip to content

Commit

Permalink
Fixes #3838. Renamed *box widgets in dijit to *Box
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.dojotoolkit.org/src/dijit/trunk@9948 560b804f-0ae3-0310-86f3-f6aa0a117693
  • Loading branch information
Douglas Hays committed Aug 4, 2007
1 parent c2b5f1f commit fcca0ee
Show file tree
Hide file tree
Showing 37 changed files with 878 additions and 878 deletions.
2 changes: 1 addition & 1 deletion _Calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dojo.declare(
This widget is used internally by other widgets and is not accessible
as a standalone widget.
This widget can't be used in a form because it doesn't serialize the date to an
<input> field. For a form element, use DateTextbox instead.
<input> field. For a form element, use DateTextBox instead.
Note that the parser takes all dates attributes passed in the `RFC 3339` format:
http://www.faqs.org/rfcs/rfc3339.html (2005-06-30T08:05:00-07:00)
Expand Down
6 changes: 3 additions & 3 deletions _editor/plugins/LinkDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dojo.require("dijit._Templated");
dojo.require("dijit._editor._Plugin");
dojo.require("dijit.Dialog");
dojo.require("dijit.form.Button");
dojo.require("dijit.form.ValidationTextbox");
dojo.require("dijit.form.ValidationTextBox");

dojo.declare("dijit._editor.plugins.DualStateDropDownButton",
dijit.form.DropDownButton,
Expand All @@ -16,7 +16,7 @@ dojo.declare("dijit._editor.plugins.DualStateDropDownButton",
);

dojo.declare("dijit._editor.plugins.UrlTextBox",
dijit.form.ValidationTextbox,
dijit.form.ValidationTextBox,
{
// summary: the URL input box we use in our dialog

Expand Down Expand Up @@ -62,7 +62,7 @@ dojo.declare("dijit._editor.plugins.LinkDialog",
"<label for='urlInput'>Url:&nbsp;</label>",
"<input dojoType=dijit._editor.plugins.UrlTextBox name='urlInput'><br>",
"<label for='textInput'>Text:&nbsp;</label>",
"<input dojoType=dijit.form.Textbox name='textInput'>",
"<input dojoType=dijit.form.TextBox name='textInput'>",
"<br>",
"<button dojoType=dijit.form.Button type='submit'>Set</button>"
].join(""),
Expand Down
12 changes: 6 additions & 6 deletions dijit-all.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ dojo.require("dijit.Tooltip");
dojo.require("dijit.Tree");

dojo.require("dijit.form.Button");
dojo.require("dijit.form.Checkbox");
dojo.require("dijit.form.CheckBox");
dojo.require("dijit.form.ComboBox");
dojo.require("dijit.form.CurrencyTextbox");
dojo.require("dijit.form.DateTextbox");
dojo.require("dijit.form.CurrencyTextBox");
dojo.require("dijit.form.DateTextBox");
dojo.require("dijit.form.FilteringSelect");
dojo.require("dijit.form.InlineEditBox");
dojo.require("dijit.form.NumberSpinner");
dojo.require("dijit.form.NumberTextbox");
dojo.require("dijit.form.NumberTextBox");
dojo.require("dijit.form.Slider");
dojo.require("dijit.form.Textarea");
dojo.require("dijit.form.Textbox");
dojo.require("dijit.form.ValidationTextbox");
dojo.require("dijit.form.TextBox");
dojo.require("dijit.form.ValidationTextBox");
dojo.require("dijit.form._DropDownTextBox");
dojo.require("dijit.form._FormWidget");
dojo.require("dijit.form._Spinner");
Expand Down
16 changes: 8 additions & 8 deletions form/Checkbox.js_CASERENAME → form/CheckBox.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dojo.provide("dijit.form.Checkbox");
dojo.provide("dijit.form.CheckBox");

dojo.require("dijit.form.Button");

dojo.declare(
"dijit.form.Checkbox",
"dijit.form.CheckBox",
dijit.form.ToggleButton,
{
// summary:
Expand All @@ -22,9 +22,9 @@ dojo.declare(
// In case 2, the regular html inputs are invisible but still used by
// the user. They are turned quasi-invisible and overlay the background-image.

templatePath: dojo.moduleUrl("dijit.form", "templates/Checkbox.html"),
templatePath: dojo.moduleUrl("dijit.form", "templates/CheckBox.html"),

baseClass: "dijitCheckbox",
baseClass: "dijitCheckBox",

// Value of "type" attribute for <input>
_type: "checkbox",
Expand All @@ -48,14 +48,14 @@ dojo.declare(
setValue: function(/*String*/ value){
if(value == null){ value = ""; }
this.inputNode.value = value;
dijit.form.Checkbox.superclass.setValue.call(this,value);
dijit.form.CheckBox.superclass.setValue.call(this,value);
}
}
);

dojo.declare(
"dijit.form.RadioButton",
dijit.form.Checkbox,
dijit.form.CheckBox,
{
// summary:
// Same as an HTML radio, but with fancy styling.
Expand All @@ -78,7 +78,7 @@ dojo.declare(
// add this widget to _groups
(this._groups[this.name] = this._groups[this.name] || []).push(this);

dijit.form.Checkbox.prototype.postCreate.apply(this, arguments);
dijit.form.CheckBox.prototype.postCreate.apply(this, arguments);
},

uninitialize: function(){
Expand All @@ -100,7 +100,7 @@ dojo.declare(
}
}, this);
}
dijit.form.Checkbox.prototype.setChecked.apply(this, arguments);
dijit.form.CheckBox.prototype.setChecked.apply(this, arguments);
},

onClick: function(/*Event*/ e){
Expand Down
12 changes: 6 additions & 6 deletions form/ComboBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dojo.provide("dijit.form.ComboBox");

dojo.require("dojo.data.ItemFileReadStore");
dojo.require("dijit.form._DropDownTextBox");
dojo.require("dijit.form.ValidationTextbox");
dojo.require("dijit.form.ValidationTextBox");
dojo.requireLocalization("dijit.form", "ComboBox");

dojo.declare(
Expand Down Expand Up @@ -58,7 +58,7 @@ dojo.declare(

getValue:function(){
// don't get the textbox value but rather the previously set hidden value
return dijit.form.Textbox.superclass.getValue.apply(this, arguments);
return dijit.form.TextBox.superclass.getValue.apply(this, arguments);
},

setDisplayedValue:function(/*String*/ value){
Expand Down Expand Up @@ -318,7 +318,7 @@ dojo.declare(
// if the user clicks away from the textbox, set the value to the textbox value
this.setDisplayedValue(this.getDisplayedValue());
}
// don't call this since the Textbox setValue is asynchronous
// don't call this since the TextBox setValue is asynchronous
// if you uncomment this line, when you click away from the textbox,
// the value in the textbox reverts to match the hidden value
//this.parentClass.onblur.apply(this, arguments);
Expand Down Expand Up @@ -429,8 +429,8 @@ dojo.declare(
},

postCreate: function(){
// call the associated Textbox postCreate
// ValidationTextbox for ComboBox; MappedTextbox for FilteringSelect
// call the associated TextBox postCreate
// ValidationTextBox for ComboBox; MappedTextBox for FilteringSelect
this.parentClass=dojo.getObject(this.declaredClass, false).superclass;
this.parentClass.postCreate.apply(this, arguments);
},
Expand Down Expand Up @@ -667,6 +667,6 @@ dojo.declare(

dojo.declare(
"dijit.form.ComboBox",
[dijit.form.ValidationTextbox, dijit.form.ComboBoxMixin],
[dijit.form.ValidationTextBox, dijit.form.ComboBoxMixin],
{}
);
12 changes: 6 additions & 6 deletions form/CurrencyTextbox.js_CASERENAME → form/CurrencyTextBox.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dojo.provide("dijit.form.CurrencyTextbox");
dojo.provide("dijit.form.CurrencyTextBox");

//FIXME: dojo.experimental throws an unreadable exception?
//dojo.experimental("dijit.form.CurrencyTextbox");
//dojo.experimental("dijit.form.CurrencyTextBox");

dojo.require("dojo.currency");
dojo.declare(
"dijit.form.CurrencyTextbox",
dijit.form.NumberTextbox,
"dijit.form.CurrencyTextBox",
dijit.form.NumberTextBox,
{
// code: String
// the ISO4217 currency code, a three letter sequence like "USD"
Expand All @@ -18,12 +18,12 @@ dojo.declare(
parse: dojo.currency.parse,

postMixInProperties: function(){
if(this.constraints === dijit.form.ValidationTextbox.prototype.constraints){
if(this.constraints === dijit.form.ValidationTextBox.prototype.constraints){
// declare a constraints property on 'this' so we don't overwrite the shared default object in 'prototype'
this.constraints = {};
}
this.constraints.currency = this.currency;
dijit.form.CurrencyTextbox.superclass.postMixInProperties.apply(this, arguments);
dijit.form.CurrencyTextBox.superclass.postMixInProperties.apply(this, arguments);
}
}
);
8 changes: 4 additions & 4 deletions form/DateTextbox.js_CASERENAME → form/DateTextBox.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
dojo.provide("dijit.form.DateTextbox");
dojo.provide("dijit.form.DateTextBox");

dojo.require("dijit._Calendar");
dojo.require("dijit.form.TimeTextbox");
dojo.require("dijit.form.TimeTextBox");

dojo.declare(
"dijit.form.DateTextbox",
dijit.form.TimeTextbox,
"dijit.form.DateTextBox",
dijit.form.TimeTextBox,
{
// summary:
// A validating, serializable, range-bound date text box.
Expand Down
2 changes: 1 addition & 1 deletion form/FilteringSelect.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dojo.require("dijit.form.ComboBox");

dojo.declare(
"dijit.form.FilteringSelect",
[dijit.form.MappedTextbox, dijit.form.ComboBoxMixin],
[dijit.form.MappedTextBox, dijit.form.ComboBoxMixin],
{
/*
* summary
Expand Down
2 changes: 1 addition & 1 deletion form/Form.js
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ dojo.declare("dijit.form._FormMixin", null,
},

isValid: function() {
// TODO: Combobox might need time to process a recently input value. This should be async?
// TODO: ComboBox might need time to process a recently input value. This should be async?
// make sure that every widget that has a validator function returns true
return dojo.every(this.getDescendants(), function(widget){
return !widget.isValid || widget.isValid();
Expand Down
2 changes: 1 addition & 1 deletion form/InlineEditBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dojo.declare(
// Save and Cancel button are displayed below the edit widget.
// When Save is clicked, the text is pulled from the edit
// widget and redisplayed and the edit widget is again hidden.
// Currently all textboxes that inherit from dijit.form.Textbox
// Currently all textboxes that inherit from dijit.form.TextBox
// are supported edit widgets.
// An edit widget must support the following API to be used:
// String getTextValue() OR String getValue()
Expand Down
6 changes: 3 additions & 3 deletions form/NumberSpinner.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
dojo.provide("dijit.form.NumberSpinner");

dojo.require("dijit.form._Spinner");
dojo.require("dijit.form.NumberTextbox");
dojo.require("dijit.form.NumberTextBox");

dojo.declare(
"dijit.form.NumberSpinner",
[dijit.form._Spinner, dijit.form.NumberTextboxMixin],
[dijit.form._Spinner, dijit.form.NumberTextBoxMixin],
{
// summary: Number Spinner
// description: This widget is the same as NumberTextbox but with up/down arrows added
// description: This widget is the same as NumberTextBox but with up/down arrows added

required: true,

Expand Down
10 changes: 5 additions & 5 deletions form/NumberTextbox.js_CASERENAME → form/NumberTextBox.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
dojo.provide("dijit.form.NumberTextbox");
dojo.provide("dijit.form.NumberTextBox");

dojo.require("dijit.form.ValidationTextbox");
dojo.require("dijit.form.ValidationTextBox");
dojo.require("dojo.number");

dojo.declare(
"dijit.form.NumberTextboxMixin",
"dijit.form.NumberTextBoxMixin",
null,
{
// summary:
Expand All @@ -17,8 +17,8 @@ dojo.declare(
);

dojo.declare(
"dijit.form.NumberTextbox",
[dijit.form.RangeBoundTextbox,dijit.form.NumberTextboxMixin],
"dijit.form.NumberTextBox",
[dijit.form.RangeBoundTextBox,dijit.form.NumberTextBoxMixin],
{
// summary:
// A validating, serializable, range-bound text box.
Expand Down
8 changes: 4 additions & 4 deletions form/Textbox.js_CASERENAME → form/TextBox.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dojo.provide("dijit.form.Textbox");
dojo.provide("dijit.form.TextBox");

dojo.require("dijit.form._FormWidget");

dojo.declare(
"dijit.form.Textbox",
"dijit.form.TextBox",
dijit.form._FormWidget,
{
// summary:
Expand Down Expand Up @@ -34,7 +34,7 @@ dojo.declare(
// HTML INPUT tag maxlength declaration.
maxlength: "999999",

templatePath: dojo.moduleUrl("dijit.form", "templates/Textbox.html"),
templatePath: dojo.moduleUrl("dijit.form", "templates/TextBox.html"),

getTextValue: function(){
return this.filter(this.textbox.value);
Expand All @@ -55,7 +55,7 @@ dojo.declare(
// synchronous value set needed for InlineEditBox
this.textbox.value = formattedValue;
}
dijit.form.Textbox.superclass.setValue.call(this, value, priorityChange);
dijit.form.TextBox.superclass.setValue.call(this, value, priorityChange);
},

forWaiValuenow: function(){
Expand Down
16 changes: 8 additions & 8 deletions form/TimeTextbox.js_CASERENAME → form/TimeTextBox.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
dojo.provide("dijit.form.TimeTextbox");
dojo.provide("dijit.form.TimeTextBox");

dojo.require("dojo.date");
dojo.require("dojo.date.locale");
dojo.require("dojo.date.stamp");
dojo.require("dijit.form._TimePicker");
dojo.require("dijit.form.ValidationTextbox");
dojo.require("dijit.form.ValidationTextBox");

dojo.declare(
"dijit.form.TimeTextbox",
dijit.form.RangeBoundTextbox,
"dijit.form.TimeTextBox",
dijit.form.RangeBoundTextBox,
{
// summary:
// A validating, serializable, range-bound date text box.
Expand All @@ -24,7 +24,7 @@ dojo.declare(
_popupClass: "dijit.form._TimePicker",

postMixInProperties: function(){
dijit.form.RangeBoundTextbox.prototype.postMixInProperties.apply(this, arguments);
dijit.form.RangeBoundTextBox.prototype.postMixInProperties.apply(this, arguments);

var constraints = this.constraints;
constraints.selector = 'time';
Expand All @@ -35,7 +35,7 @@ dojo.declare(
onfocus: function(/*Event*/ evt){
// open the calendar
this._open();
dijit.form.RangeBoundTextbox.prototype.onfocus.apply(this, arguments);
dijit.form.RangeBoundTextBox.prototype.onfocus.apply(this, arguments);
},

setValue: function(/*Date*/date, /*Boolean, optional*/ priorityChange){
Expand Down Expand Up @@ -63,13 +63,13 @@ dojo.declare(
setTimeout(dijit.popup.close, 1); // allow focus time to take

// this will cause InlineEditBox and other handlers to do stuff so make sure it's last
dijit.form.TimeTextbox.superclass.setValue.call(self, value, true);
dijit.form.TimeTextBox.superclass.setValue.call(self, value, true);
},
lang: this.lang,
constraints:this.constraints,
isDisabledDate: function(/*Date*/ date){
// summary:
// disables dates outside of the min/max of the TimeTextbox
// disables dates outside of the min/max of the TimeTextBox
return self.constraints && (dojo.date.compare(self.constraints.min,date) > 0 || dojo.date.compare(self.constraints.max,date) < 0);
}
});
Expand Down
Loading

0 comments on commit fcca0ee

Please sign in to comment.