Add language.js

ITCase-django · Sep 8, 2020 · cae6b85 · cae6b85
1 parent 815f14e
commit cae6b85
Show file tree

Hide file tree

Showing 13 changed files with 365 additions and 215 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.0.27
+------
+* Add language.js
+
 0.0.26
 ------
 * Update tinymce4 to 5+

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "django-tinymce-4",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "homepage": "https://github.com/ITCase-django/django-tinymce-4",
   "authors": [
     "ITCase <[email protected]>"

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "django-tinymce-4",
   "title": "Integrate TinyMCE in Django projects",
   "description": "",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "homepage": "http://www.github.com/ITCase-django/django-tinymce-4/",
   "author": "ITCase <[email protected]> (http://www.itcase.pro/)",
   "repository": {

diff --git a/tinymce_4/__init__.py b/tinymce_4/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.0.26'
+__version__ = '0.0.27'
diff --git a/tinymce_4/static/tinymce_4/langs/ru.js b/tinymce_4/static/tinymce_4/langs/ru.js
diff --git a/tinymce_4/static/tinymce_4/settings/full.js b/tinymce_4/static/tinymce_4/settings/full.js
@@ -33,6 +33,10 @@ if (typeof tinySettings !== 'undefined') {
     tinySettings.image_class_list = tinyImageClassList;
   }
 
+  if (typeof tinyLanguage !== 'undefined') {
+    tinySettings.language = tinyLanguage;
+  }
+
   if (typeof tinyLanguageUrl !== 'undefined') {
     tinySettings.language_url = tinyLanguageUrl;
   }

diff --git a/tinymce_4/static/tinymce_4/settings/full/external_plugins.js b/tinymce_4/static/tinymce_4/settings/full/external_plugins.js
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-var tinyExternalPlugins = {
-  'insertzoomimage': '/static/tinymce_4/plugins/insertZoomImage.js'
-=======
 var externalPlugins = {
-  'insertzoomimage': '/static/tinymce_4/plugins/insertZoomImage.js',
   'typograf': '/static/tinymce_4/plugins/typograf.js'
->>>>>>> master
 }
diff --git a/tinymce_4/static/tinymce_4/settings/full/language.js b/tinymce_4/static/tinymce_4/settings/full/language.js
@@ -0,0 +1,2 @@
+var tinyLanguageUrl = '';
+var tinyLanguage = '';
diff --git a/tinymce_4/static/tinymce_4/settings/full/language_url.js b/tinymce_4/static/tinymce_4/settings/full/language_url.js
diff --git a/tinymce_4/static/tinymce_4/settings/full/plugins.js b/tinymce_4/static/tinymce_4/settings/full/plugins.js
@@ -1,6 +1,4 @@
 var tinyPlugins = [
-  // custom
-  'insertzoomimage',
   // tiny
   'advlist',
   'anchor',

diff --git a/tinymce_4/static/tinymce_4/settings/full/settings.js b/tinymce_4/static/tinymce_4/settings/full/settings.js
@@ -14,6 +14,7 @@ var tinySettings = {
   plugin_preview_width: '730',
   plugin_preview_height: '550',
 
+  language: '',
   language_url: '',
 
   content_css: [

diff --git a/tinymce_4/static/tinymce_4/tinymce_initialization.js b/tinymce_4/static/tinymce_4/tinymce_initialization.js
diff --git a/tinymce_4/widgets.py b/tinymce_4/widgets.py
@@ -45,7 +45,7 @@ class Media:
             'tinymce_4/settings/full/menubar.js',
             'tinymce_4/settings/full/menu.js',
             'tinymce_4/settings/full/toolbar.js',
-            'tinymce_4/settings/full/language_url.js',
+            'tinymce_4/settings/full/language.js',
             'tinymce_4/settings/full/plugins.js',
             'tinymce_4/settings/full/style_formats.js',
             'tinymce_4/settings/full/table_class_list.js',
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		var tinyLanguageUrl = '';
		var tinyLanguage = '';