Merge pull request #36 from industrydive/TECH-7818-inline-image-attri…

…bution Tech 7818 inline image attribution
industrydive · Feb 19, 2020 · 9294f16 · 9294f16
2 parents 5d54c68 + f7b81f6
commit 9294f16
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git 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__ ='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.

diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js b/ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js
@@ -969,18 +969,6 @@
  new_credit = json_obj.attribution;
  }
 
- if ( json_obj.attributionUrl.length ) {
- var start_link = '<a href="' + json_obj.attributionUrl + '">';
- var link_text = new_credit.length ? new_credit : json_obj.attributionUrl
- new_credit = start_link + link_text + '</a>';
- }
-
- // set this so that we will replace the current
- // credit
- if ( ! new_credit.length ) {
- new_credit = ' ';
- }
-
  return new_credit;
  }
  },

diff --git 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='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',