tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-30 08:29:34 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #124 from ryanwachtl/silverstripe-cms

Browse Source 
---

The behaviour of updating the URLSegment field after the first edit of Title field when a new page is created was broken in 1863bb00db
This commit is contained in:
Ingo Schommer 2012-05-11 14:06:42 +02:00
commit b77920e2fe
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
javascript/CMSMain.EditForm.js
View File

@ -34,7 +34,7 @@
self.updatePageTitleHeading();
self.parents('form').find('input[name=MetaTitle], input[name=MenuTitle]').val(self.val());
// update the URLSegment
URLSegment.closest('.urlsegment').update(self);
URLSegment.closest('.field.urlsegment').update(self);
} else {
return;
}

17
javascript/SiteTreeURLSegmentField.js
View File

@ -26,9 +26,9 @@
* Return URLSegemnt val()
*
* Parameters:
* (Bool) external (optional)
* (DOMElement) other (optional)
*/
edit: function(external) {
edit: function(other) {
var field = this.find(':text'),
holder = this.find('.preview'),
@ -59,7 +59,7 @@
// field updated from another fields value
// reset to original state
if (external) this.edit();
if (other) this.edit();
return field.val();
},
@ -78,11 +78,10 @@
holder = this.find('.preview'),
currentVal = holder.text(),
updateVal,
external = null;
other = arguments[0];
if (field && field.val() !== "") {
updateVal = field.val();
external = true;
if (other && other.val() !== "") {
updateVal = other.val();
} else {
updateVal = field.val();
}
@ -91,7 +90,7 @@
self.suggest(updateVal, function(data) {
var newVal = decodeURIComponent(data.value);
field.val(newVal);
self.edit(external);
self.edit(other);
});
} else {
self.edit();
@ -201,7 +200,7 @@
*/
_autoInputWidth: function() {
var field = this.find(':text');
field.width((field.width() + 9) - this.find('.prefix').width());
field.width((field.width() + 15) - this.find('.prefix').width());
}
});
});