From 636cf97cdc0a153d3d848b43afcf699eaa34b46a Mon Sep 17 00:00:00 2001 From: willie Date: Wed, 12 Feb 2020 09:36:57 -0500 Subject: [PATCH 01/12] update attribution --- .../plugins/diveimage/dialogs/diveimage.js | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js index 43f3c1a35..88e1d11b8 100644 --- a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js +++ b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js @@ -965,20 +965,8 @@ parseJsonAttribution: function(json_obj) { var new_credit = ''; - if ( json_obj.attribution.length ) { - new_credit = json_obj.attribution; - } - - if ( json_obj.attributionUrl.length ) { - var start_link = ''; - var link_text = new_credit.length ? new_credit : json_obj.attributionUrl - new_credit = start_link + link_text + ''; - } - - // set this so that we will replace the current - // credit - if ( ! new_credit.length ) { - new_credit = ' '; + if ( json_obj.inlineAttribution.length ) { + new_credit = json_obj.inlineAttribution; } return new_credit; From 47132f8e9418ca913801499d4dc5558c4f25a9e6 Mon Sep 17 00:00:00 2001 From: willie Date: Wed, 12 Feb 2020 10:09:06 -0500 Subject: [PATCH 02/12] add console log --- .../ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js index 88e1d11b8..c789c3196 100644 --- a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js +++ b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js @@ -964,6 +964,7 @@ }, parseJsonAttribution: function(json_obj) { var new_credit = ''; + console.log('CHANGING THE IMAGE ATTRIBUTION NOW!!'); if ( json_obj.inlineAttribution.length ) { new_credit = json_obj.inlineAttribution; From cdf107910fa19fb6fcf5641521a8f1892a6fb16e Mon Sep 17 00:00:00 2001 From: willie Date: Wed, 12 Feb 2020 10:36:07 -0500 Subject: [PATCH 03/12] update version for testing --- ckeditor/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ckeditor/__init__.py b/ckeditor/__init__.py index f80275c7d..65d9e5966 100644 --- a/ckeditor/__init__.py +++ b/ckeditor/__init__.py @@ -5,7 +5,7 @@ from django.core.exceptions import ImproperlyConfigured # Following PEP 440 Standards -__version__ ='4.4.7+dive.ckeditor.10' # update this when deploying new version to production +__version__ ='47132f8e9418ca913801499d4dc5558c4f25a9e6' # update this when deploying new version to production if 'ckeditor' in settings.INSTALLED_APPS: # Confirm CKEDITOR_UPLOAD_PATH setting has been specified. diff --git a/setup.py b/setup.py index 3b529a02a..d4f361522 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ def get_source_files(): setup( name='django-ckeditor', - version='4.4.7+dive.ckeditor.11', + version='47132f8e9418ca913801499d4dc5558c4f25a9e6', description='Django admin CKEditor integration.', long_description=open('README.rst', 'r').read() + open('AUTHORS.rst', 'r').read() + open('CHANGELOG.rst', 'r').read(), author='Shaun Sephton & Piotr Malinski', From 2a1d81868a4899b410efda69796bb499fbc99738 Mon Sep 17 00:00:00 2001 From: willie Date: Wed, 12 Feb 2020 11:10:01 -0500 Subject: [PATCH 04/12] add imagemodelwidget changes --- .../plugins/imagemodelwidget/dialogs/imagemodelwidget.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/imagemodelwidget/dialogs/imagemodelwidget.js b/ckeditor/static/ckeditor/ckeditor/plugins/imagemodelwidget/dialogs/imagemodelwidget.js index 4c18adfbd..9fa674b24 100644 --- a/ckeditor/static/ckeditor/ckeditor/plugins/imagemodelwidget/dialogs/imagemodelwidget.js +++ b/ckeditor/static/ckeditor/ckeditor/plugins/imagemodelwidget/dialogs/imagemodelwidget.js @@ -28,12 +28,8 @@ CKEDITOR.dialog.add( 'imagemodelwidget', function( editor ) { var attribution_area = parent_dialog.getContentElement(tab, prefix+'attribution'); var new_attribution = ''; - if ( json_obj.attribution.length ) { - new_attribution = json_obj.attribution; - } - - if ( json_obj.attributionUrl.length ) { - new_attribution = '' + new_attribution + ''; + if ( json_obj.inlineAttribution.length ) { + new_attribution = json_obj.inlineAattribution; } attribution_area.setValue(new_attribution); From eeebb615de7ce8b7f0013328e01dd592019de314 Mon Sep 17 00:00:00 2001 From: willie Date: Wed, 12 Feb 2020 11:26:15 -0500 Subject: [PATCH 05/12] add console log --- .../ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js index c789c3196..11efad8e7 100644 --- a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js +++ b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js @@ -965,6 +965,7 @@ parseJsonAttribution: function(json_obj) { var new_credit = ''; console.log('CHANGING THE IMAGE ATTRIBUTION NOW!!'); + console.log(json_obj); if ( json_obj.inlineAttribution.length ) { new_credit = json_obj.inlineAttribution; From 07ab53ddd0145c46cda1eb8771adaae97c3de933 Mon Sep 17 00:00:00 2001 From: willie Date: Wed, 12 Feb 2020 14:04:02 -0500 Subject: [PATCH 06/12] temporarily change fetch url for local testing --- .../ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js index 11efad8e7..aba2154b3 100644 --- a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js +++ b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js @@ -86,7 +86,7 @@ var img_id = this.getContentElement('advanced', 'dive_id').getValue(); if ( parseInt(img_id) > 0 ) { - var fetch_url = '/api/v1/diveimage/get_data/?camelcase=1&id=' + img_id; + var fetch_url = 'http://localhost:8000/api/v1/diveimage/get_data/?camelcase=1&id=' + img_id; json_text = CKEDITOR.ajax.load(fetch_url); json_obj = JSON.parse(json_text); json_elem.setValue(json_text); From 818225df2db95dbdb6819ddb0e374b4e922f0dda Mon Sep 17 00:00:00 2001 From: willie Date: Wed, 12 Feb 2020 14:15:55 -0500 Subject: [PATCH 07/12] change back url --- .../ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js index aba2154b3..11efad8e7 100644 --- a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js +++ b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js @@ -86,7 +86,7 @@ var img_id = this.getContentElement('advanced', 'dive_id').getValue(); if ( parseInt(img_id) > 0 ) { - var fetch_url = 'http://localhost:8000/api/v1/diveimage/get_data/?camelcase=1&id=' + img_id; + var fetch_url = '/api/v1/diveimage/get_data/?camelcase=1&id=' + img_id; json_text = CKEDITOR.ajax.load(fetch_url); json_obj = JSON.parse(json_text); json_elem.setValue(json_text); From b4165fa08a95533421938bf17296f898a1a52009 Mon Sep 17 00:00:00 2001 From: willie Date: Tue, 18 Feb 2020 13:55:04 -0500 Subject: [PATCH 08/12] necessary changes for image attribution --- .../ckeditor/plugins/diveimage/dialogs/diveimage.js | 2 -- .../plugins/imagemodelwidget/dialogs/imagemodelwidget.js | 8 ++++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js index 11efad8e7..88e1d11b8 100644 --- a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js +++ b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js @@ -964,8 +964,6 @@ }, parseJsonAttribution: function(json_obj) { var new_credit = ''; - console.log('CHANGING THE IMAGE ATTRIBUTION NOW!!'); - console.log(json_obj); if ( json_obj.inlineAttribution.length ) { new_credit = json_obj.inlineAttribution; diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/imagemodelwidget/dialogs/imagemodelwidget.js b/ckeditor/static/ckeditor/ckeditor/plugins/imagemodelwidget/dialogs/imagemodelwidget.js index 9fa674b24..4c18adfbd 100644 --- a/ckeditor/static/ckeditor/ckeditor/plugins/imagemodelwidget/dialogs/imagemodelwidget.js +++ b/ckeditor/static/ckeditor/ckeditor/plugins/imagemodelwidget/dialogs/imagemodelwidget.js @@ -28,8 +28,12 @@ CKEDITOR.dialog.add( 'imagemodelwidget', function( editor ) { var attribution_area = parent_dialog.getContentElement(tab, prefix+'attribution'); var new_attribution = ''; - if ( json_obj.inlineAttribution.length ) { - new_attribution = json_obj.inlineAattribution; + if ( json_obj.attribution.length ) { + new_attribution = json_obj.attribution; + } + + if ( json_obj.attributionUrl.length ) { + new_attribution = '' + new_attribution + ''; } attribution_area.setValue(new_attribution); From fcae8b03c5616a10cacf0956fc04964d12924e8f Mon Sep 17 00:00:00 2001 From: willie Date: Tue, 18 Feb 2020 13:56:29 -0500 Subject: [PATCH 09/12] change django-ckeditor version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d4f361522..d4bfcbf15 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ def get_source_files(): setup( name='django-ckeditor', - version='47132f8e9418ca913801499d4dc5558c4f25a9e6', + version='4.4.7+dive.ckeditor.12', description='Django admin CKEditor integration.', long_description=open('README.rst', 'r').read() + open('AUTHORS.rst', 'r').read() + open('CHANGELOG.rst', 'r').read(), author='Shaun Sephton & Piotr Malinski', From 49764db9b30219b4fb015504fec12252d2cf9361 Mon Sep 17 00:00:00 2001 From: willie Date: Tue, 18 Feb 2020 13:59:30 -0500 Subject: [PATCH 10/12] update version --- ckeditor/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckeditor/__init__.py b/ckeditor/__init__.py index 65d9e5966..b7fcf3201 100644 --- a/ckeditor/__init__.py +++ b/ckeditor/__init__.py @@ -5,7 +5,7 @@ from django.core.exceptions import ImproperlyConfigured # Following PEP 440 Standards -__version__ ='47132f8e9418ca913801499d4dc5558c4f25a9e6' # update this when deploying new version to production +__version__ ='4.4.7+dive.ckeditor.12' # update this when deploying new version to production if 'ckeditor' in settings.INSTALLED_APPS: # Confirm CKEDITOR_UPLOAD_PATH setting has been specified. From 742419e5bb4b004b7b5e5c79b43fc7d04e612109 Mon Sep 17 00:00:00 2001 From: willie Date: Wed, 19 Feb 2020 09:14:22 -0500 Subject: [PATCH 11/12] rename to just attribution --- .../ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js index 88e1d11b8..c8a83f46d 100644 --- a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js +++ b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js @@ -965,8 +965,8 @@ parseJsonAttribution: function(json_obj) { var new_credit = ''; - if ( json_obj.inlineAttribution.length ) { - new_credit = json_obj.inlineAttribution; + if ( json_obj.Attribution.length ) { + new_credit = json_obj.Attribution; } return new_credit; From f7b81f66c372f0c64fc5b0caebea48f553a4cb58 Mon Sep 17 00:00:00 2001 From: willie Date: Wed, 19 Feb 2020 09:25:30 -0500 Subject: [PATCH 12/12] fix typo --- .../ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js index c8a83f46d..63c7c96eb 100644 --- a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js +++ b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js @@ -965,8 +965,8 @@ parseJsonAttribution: function(json_obj) { var new_credit = ''; - if ( json_obj.Attribution.length ) { - new_credit = json_obj.Attribution; + if ( json_obj.attribution.length ) { + new_credit = json_obj.attribution; } return new_credit;