Skip to content

Fixes to support CMS install in subfolder #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cwchong wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes to support CMS install in subfolder #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b12520a
Support CMS installation in sub-directory
cwchong Jul 19, 2017
5d59d01
Use oldstyle array declaration to support PHP<5.4
cwchong Jul 19, 2017
9342a53
Use relative url for aviary_image
cwchong Jul 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions code/controllers/AviaryUpload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public function update() {

if($this->request->isAjax()) {
$this->request->addHeader('Content-type', 'application/json');
return json_encode([
return json_encode(array(
'thumbnail' => $thumbnail
]);
));
}

return $thumbnail;
Expand Down Expand Up @@ -75,9 +75,9 @@ public function localupdate() {

if($this->request->isAjax()) {
$this->request->addHeader('Content-type', 'application/json');
return json_encode([
return json_encode(array(
'thumbnail' => $thumbnail
]);
));
}

return $thumbnail;
Expand All @@ -90,4 +90,4 @@ public function canEdit($member = null) {

return Permission::checkMember($member, array('CMS_ACCESS_AssetAdmin', 'CMS_ACCESS_LeftAndMain'));
}
}
}
4 changes: 2 additions & 2 deletions code/extensions/AviaryHtmlEditorFieldToolbarExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public function updateFieldsForFile(FieldList $fields, $url, $file)
// Image pointer
$aviaryImage = LiteralField::create(
'AviaryImage',
'<img class="aviary_image" id="aviary_image_' . $file->ID . '" src="/' . $url . '" style="display: none;" />'
'<img class="aviary_image" id="aviary_image_' . $file->ID . '" src="' . $url . '" style="display: none;" />'
);

// create edit button
Expand All @@ -41,4 +41,4 @@ public function updateFieldsForFile(FieldList $fields, $url, $file)
$fields->insertAfter($aviaryImage, 'FilePreviewImage');
}
}
}
}
15 changes: 9 additions & 6 deletions javascript/aviary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
var featherEditor, initAviary;

(function($) {
initAviary = function(apiKey, localProcessing, iframePointer) {
initAviary = function(apiKey, localProcessing, iframePointer, baseHref) {
baseHref = baseHref || '/';
// TODO: add tools-option to config.yml (if people want to slim it down), use in this call.
featherEditor = new Aviary.Feather({
apiKey: apiKey,
Expand All @@ -24,7 +25,7 @@ var featherEditor, initAviary;
featherEditor.getImageData(function (image) {
$.ajax({
type: "POST",
url: '/AviaryUpload/localupdate',
url: baseHref + 'AviaryUpload/localupdate',
data: {
imageData: image,
imageID: imageID.replace('aviary_image_', '')
Expand All @@ -34,7 +35,7 @@ var featherEditor, initAviary;
success: function (data, textStatus, jqXHR) {
if (typeof data.thumbnail !== 'undefined') {
// iFrame hack
if (typeof iframePointer !== 'undefined') {
if (typeof iframePointer !== 'undefined' && iframePointer !== null) {
$('#thumbnailImage', $(iframePointer).contents()).attr('src', data.thumbnail);
} else {
$('#thumbnailImage').attr('src', data.thumbnail);
Expand Down Expand Up @@ -71,7 +72,7 @@ var featherEditor, initAviary;

$.ajax({
type: "POST",
url: '/AviaryUpload/update',
url: baseHref + 'AviaryUpload/update',
data: {
url: newURL,
imageID: imageID.replace('aviary_image_', '')
Expand Down Expand Up @@ -126,11 +127,13 @@ var featherEditor, initAviary;

var imageID = $(document).find('.aviary_image').attr('id').replace('aviary_image_', '');
var iframePointer = "li[data-fileid='"+imageID+"'] iframe";
var baseHref = $(document).find("base").attr('href'); // fix for cms in subfolder

// add iframePointer to aviary, for pingback (save: thumb update)
window.top.initAviary($(this).data('apikey'), $(this).data('localprocessing'), iframePointer);
window.top.initAviary($(this).data('apikey'), $(this).data('localprocessing'), iframePointer, baseHref);
} else {
initAviary($(this).data('apikey'), $(this).data('localprocessing'));
var baseHref = $("base").attr('href'); // fix for cms in subfolder
initAviary($(this).data('apikey'), $(this).data('localprocessing'), null, baseHref);
}
},

Expand Down