API CHANGE Removed baseHref() javascript method

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92638 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-11-21 02:37:51 +00:00
parent d5d4d73141
commit 9b1f5bc81c
4 changed files with 4 additions and 9 deletions

View File

@ -690,11 +690,6 @@ function hideLoading() {
if($('Loading')) $('Loading').style.display = 'none'; if($('Loading')) $('Loading').style.display = 'none';
Element.removeClassName(document.body, 'stillLoading'); Element.removeClassName(document.body, 'stillLoading');
} }
function baseHref() {
var baseTags = document.getElementsByTagName('base');
if(baseTags) return baseTags[0].href;
else return "";
}
returnFalse = function() { returnFalse = function() {
return false; return false;

View File

@ -265,7 +265,7 @@ TreeNodeAPI.prototype = {
parentClause = "&parentID=" + this.parentTreeNode.getIdx(); parentClause = "&parentID=" + this.parentTreeNode.getIdx();
} }
new Ajax.Request(baseHref() + 'admin/duplicate/' + this.getIdx() + '?ajax=1' + parentClause, { new Ajax.Request(jQuery('base').attr('href') + 'admin/duplicate/' + this.getIdx() + '?ajax=1' + parentClause, {
method : 'get', method : 'get',
onSuccess : Ajax.Evaluator, onSuccess : Ajax.Evaluator,
onFailure : function(response) { onFailure : function(response) {
@ -274,7 +274,7 @@ TreeNodeAPI.prototype = {
}); });
}, },
duplicatePageWithChildren: function() { duplicatePageWithChildren: function() {
new Ajax.Request(baseHref() + 'admin/duplicatewithchildren/' + this.getIdx() + '?ajax=1', { new Ajax.Request(jQuery('base').attr('href') + 'admin/duplicatewithchildren/' + this.getIdx() + '?ajax=1', {
method : 'get', method : 'get',
onSuccess : Ajax.Evaluator, onSuccess : Ajax.Evaluator,
onFailure : function(response) { onFailure : function(response) {

View File

@ -81,7 +81,7 @@ CMSForm.prototype = {
rightHTML = rightHTML.replace(/(<a[^>]+href *= *")#/g, '$1' + window.location.href.replace(/#.*$/,'') + '#'); rightHTML = rightHTML.replace(/(<a[^>]+href *= *")#/g, '$1' + window.location.href.replace(/#.*$/,'') + '#');
// Rewrite iframe links (for IE) // Rewrite iframe links (for IE)
rightHTML = rightHTML.replace(/(<iframe[^>]*src=")([^"]+)("[^>]*>)/g, '$1' + baseHref() + '$2$3'); rightHTML = rightHTML.replace(/(<iframe[^>]*src=")([^"]+)("[^>]*>)/g, '$1' + jQuery('base').attr('href') + '$2$3');
// Note: TinyMCE coupling // Note: TinyMCE coupling
tinymce_removeAll(); tinymce_removeAll();

View File

@ -6,7 +6,7 @@ Behaviour.register({
if(originalID && originalID.substr(0,3) == 'new') { if(originalID && originalID.substr(0,3) == 'new') {
alert("You have to save a page before translating it"); alert("You have to save a page before translating it");
} else { } else {
var url = baseHref() + 'admin/' + this.name.substring(7) + '?ID=' + $('Form_EditForm_ID').value + '&newlang=' + var url = jQuery('base').attr('href') + 'admin/' + this.name.substring(7) + '?ID=' + $('Form_EditForm_ID').value + '&newlang=' +
$('Form_EditForm_NewTransLang').value + '&ajax=1'; $('Form_EditForm_NewTransLang').value + '&ajax=1';
url += "&locale=" + $('Form_EditForm_Locale').value; url += "&locale=" + $('Form_EditForm_Locale').value;