mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
#19152: Removing Content Picker's dependency on /admin urls
Work Item: 19152 --HG-- branch : 1.x
This commit is contained in:
@@ -28,7 +28,8 @@
|
|||||||
if (menuText.val().length == 0) {
|
if (menuText.val().length == 0) {
|
||||||
menuText.val(data.displayText);
|
menuText.val(data.displayText);
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
baseUrl: '@Url.Content("~/")'
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
//]]>
|
//]]>
|
||||||
|
@@ -15,9 +15,13 @@
|
|||||||
};
|
};
|
||||||
$[callbackName].data = data;
|
$[callbackName].data = data;
|
||||||
|
|
||||||
var adminIndex = location.href.toLowerCase().indexOf("/admin/");
|
var baseUrl = data.baseUrl;
|
||||||
if (adminIndex === -1) return;
|
|
||||||
var url = location.href.substr(0, adminIndex)
|
// remove trailing slash if any
|
||||||
|
if (baseUrl.substr(-1) == '/')
|
||||||
|
baseUrl.substr(0, baseUrl.length - 1);
|
||||||
|
|
||||||
|
var url = baseUrl
|
||||||
+ "/Admin/Orchard.ContentPicker?"
|
+ "/Admin/Orchard.ContentPicker?"
|
||||||
+ "callback=" + callbackName
|
+ "callback=" + callbackName
|
||||||
+ "&" + (new Date() - 0);
|
+ "&" + (new Date() - 0);
|
||||||
|
@@ -86,7 +86,8 @@
|
|||||||
|
|
||||||
refreshIds();
|
refreshIds();
|
||||||
$('#save-message-@Html.FieldIdFor(m => m.Field.Ids)').show();
|
$('#save-message-@Html.FieldIdFor(m => m.Field.Ids)').show();
|
||||||
}
|
},
|
||||||
|
baseUrl: '@Url.Content("~/")'
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user