Merge commit 'b8845e25fa' into WebGUI8. Up to 7.10.0
This commit is contained in:
commit
0180b11064
45 changed files with 480 additions and 46 deletions
BIN
www/extras/adminConsole/addons.png
Normal file
BIN
www/extras/adminConsole/addons.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
BIN
www/extras/adminConsole/small/addons.png
Normal file
BIN
www/extras/adminConsole/small/addons.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
|
|
@ -38,9 +38,18 @@
|
|||
|
||||
var Cart = {
|
||||
attachAddressBlurHandlers: function (name) {
|
||||
var fields = _.values(this.elements[name]),
|
||||
var els = this.elements[name],
|
||||
label = els.label,
|
||||
addr = els.address1,
|
||||
fields = _.values(els),
|
||||
handler = this.createAddressBlurHandler(name);
|
||||
this.event.on(fields, 'focusout', handler);
|
||||
this.event.on(addr, 'focusout', function () {
|
||||
if (!label.value) {
|
||||
label.value = addr.value;
|
||||
label.blur();
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
attachAddressSelectHandler: function (name) {
|
||||
|
|
@ -300,6 +309,16 @@
|
|||
var id = o.responseText,
|
||||
d = self.elements.dropdowns;
|
||||
|
||||
if (!id.match(/^[A-Za-z0-9_-]{22}$/)) {
|
||||
alert('Error: bad response trying to save address.');
|
||||
return;
|
||||
}
|
||||
|
||||
if (!id.match(/^[A-Za-z0-9_-]{22}$/)) {
|
||||
alert('Error: bad response trying to save address.');
|
||||
return;
|
||||
}
|
||||
|
||||
function updateOne(dropdown) {
|
||||
var opt = _.detect(dropdown.options, function (o) {
|
||||
return o.text === label;
|
||||
|
|
@ -401,7 +420,7 @@
|
|||
var url = this.baseUrl,
|
||||
cb = { success: success },
|
||||
query = _(params).map(function (v, k) {
|
||||
return [k, v].join('=');
|
||||
return [k, escape(v)].join('=');
|
||||
}).join('&');
|
||||
|
||||
if (method === 'GET') {
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ WebGUI.Form.JsonTable.prototype.init
|
|||
|
||||
// Fill in values based on field type
|
||||
var cells = newRow.getElementsByTagName( "td" );
|
||||
for ( var i = 0; i < this.columns.length - 1; i++ ) { // Last cell is for buttons
|
||||
for ( var i = 0; i < this.columns.length; i++ ) { // Last cell is for buttons
|
||||
var cell = cells[i];
|
||||
var column = this.columns[i];
|
||||
var field = cell.childNodes[0];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue