TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-23 22:11:09 +03:00
Code Issues Projects Releases Wiki Activity

Fix image uploader and update tests

Browse Source 
No Issue

- fixes removal of url link on image uploader
- fixes functional tests for editor and content
This commit is contained in:
cobbspur 2015-05-20 19:22:29 +01:00 committed by Hannah Wolfe
parent b92314904b
commit e6ae302aca
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghost/admin/app/assets/lib/uploader.js
View File

@ -70,7 +70,7 @@ UploadUi = function ($dropzone, settings) {
$dropzone.find('.js-url').remove(); $dropzone.find('.js-url').remove();
$progress.find('.js-upload-progress-bar').removeClass('fail'); $progress.find('.js-upload-progress-bar').removeClass('fail');
$dropzone.trigger('uploadstart', [$dropzone.attr('id')]); $dropzone.trigger('uploadstart', [$dropzone.attr('id')]);
$dropzone.find('span.media, div.description, a.icon-link, a.image-webcam') $dropzone.find('span.media, div.description, a.image-url, a.image-webcam')
.animate({opacity: 0}, 250, function () { .animate({opacity: 0}, 250, function () {
$dropzone.find('div.description').hide().css({opacity: 100}); $dropzone.find('div.description').hide().css({opacity: 100});
if (settings.progressbar) { if (settings.progressbar) {
@ -139,7 +139,7 @@ UploadUi = function ($dropzone, settings) {
}, },
removeExtras: function () { removeExtras: function () {
$dropzone.find('span.media, div.js-upload-progress, a.icon-link, a.image-upload, a.image-webcam, div.js-fail, button.js-fail, a.js-cancel').remove(); $dropzone.find('span.media, div.js-upload-progress, a.image-url, a.image-upload, a.image-webcam, div.js-fail, button.js-fail, a.js-cancel').remove();
}, },
initWithDropzone: function () { initWithDropzone: function () {
@ -156,7 +156,7 @@ UploadUi = function ($dropzone, settings) {
self.initUrl(); self.initUrl();
return; return;
} }
$dropzone.find('a.icon-link').on('click', function () { $dropzone.find('a.image-url').on('click', function () {
self.initUrl(); self.initUrl();
}); });
}, },