Update Redactor to 3.4.6.

Resolve #281
craftcms · Nov 30, 2020 · a92c891 · a92c891
1 parent 84a7776
commit a92c891
Show file tree

Hide file tree

Showing 28 changed files with 231 additions and 82 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes for Redactor for Craft CMS
 
+## Unreleased
+
+### Changed
+- Updated Redactor to 3.4.6. ([#281](https://github.com/craftcms/redactor/issues/281))
+
 ## 2.8.3 - 2020-10-19
 
 ### Fixed

diff --git a/lib/redactor-plugins/beyondgrammar/beyondgrammar.js b/lib/redactor-plugins/beyondgrammar/beyondgrammar.js
@@ -16,6 +16,11 @@
             {
                 e.preventDefault();
                 this.app.stopBlur = true;
+                var offset = this.app.offset.get();
+                setTimeout(function() {
+                    this.app.offset.set(offset);
+                }.bind(this), 10);
+
                 return;
             }
 

diff --git a/lib/redactor-plugins/fullscreen/fullscreen.js b/lib/redactor-plugins/fullscreen/fullscreen.js
@@ -77,6 +77,8 @@
             this.selection.restore();
 			this.isOpen = true;
 			this.opts.zindex = 1051;
+			// fix bootstrap modal focus
+            if (window.jQuery) jQuery(document).off('focusin.modal');
 		},
 		close: function()
 		{

diff --git a/lib/redactor-plugins/properties/properties.js b/lib/redactor-plugins/properties/properties.js
@@ -70,6 +70,9 @@
                 }
             }
         },
+        onclick: function() {
+            //this._observeButton();
+        },
 
         // public
         start: function()

diff --git a/lib/redactor-plugins/video/video.js b/lib/redactor-plugins/video/video.js
@@ -25,13 +25,15 @@
             this.component = app.component;
             this.insertion = app.insertion;
             this.inspector = app.inspector;
+            this.selection = app.selection;
         },
         // messages
         onmodal: {
             video: {
                 opened: function($modal, $form)
                 {
-                    $form.getField('video').focus();
+                    $video = $form.getField('video');
+                    $video.focus();
                 },
                 insert: function($modal, $form)
                 {

diff --git a/lib/redactor/_langs/de.js b/lib/redactor/_langs/de.js
@@ -59,6 +59,48 @@
         "right": "Rechts",
         "center": "Mitte",
         "undo": "Rückgängig",
-        "redo": "Wiederholen"
+        "redo": "Wiederholen",
+
+        /* Table plugin */
+        "table": "Tabelle",
+        "insert-table": "Tabelle einfügen",
+        "insert-row-above": "Zeile oberhalb hinzufügen",
+        "insert-row-below": "Zeile unterhalb hinzufügen",
+        "insert-column-left": "Spalte links einfügen",
+        "insert-column-right": "Spalte rechts einfügen",
+        "add-head": "Tabellenrubrik einfügen",
+        "delete-head": "Tabellenrubrik löschen",
+        "delete-column": "Spalte löschen",
+        "delete-row": "Zeile löschen",
+        "delete-table": "Tabelle löschen",
+
+        /* Fullscreen plugin */
+        "fullscreen": "Vollbildanzeige",
+
+        /* Font color plugin */
+        "fontcolor": "Schriftfarbe",
+        "highlight": "Hintergrundsfarbe",
+
+        /* Font family plugin */
+        "fontfamily": "Schriftfamilie",
+        "remove-font-family": "Schriftart zurücksetzen",
+
+        /* Font size plugin */
+        "size": "Schriftgrösse",
+        "remove-size": "Textgröße zurücksetzen",
+
+        /* Imagemanager/Filemanager plugin */
+        "choose": "Wählen",
+
+        /* Alignment plugin */
+        "align": "Ausrichten",
+        "align-left": "Text links ausrichten",
+        "align-center": "Text zentrieren",
+        "align-right": "Text rechts ausrichten",
+        "align-justify": "Text ausrichten",
+
+        /* Video plugin */
+        "video": "Video",
+        "video-html-code": "Video von Youtube oder Vimeo einbetten"
     };
 })(Redactor);
diff --git a/lib/redactor/_langs/sv.js b/lib/redactor/_langs/sv.js
@@ -46,7 +46,7 @@
         "outdent": "Minska utdrag",
         "indent": "Öka utdrag",
         "horizontalrule": "Linje",
-        "upload": "Upload",
+        "upload": "Ladda upp",
         "upload-label": "Släpp filer här eller klicka för att ladda upp",
         "upload-change-label": "Drop a new image to change",
         "accessibility-help-label": "Textredigerare",
@@ -87,6 +87,21 @@
 
         /* Font size plugin */
         "size": "Storlek",
-        "remove-size":  "Återställ textstorlek"
+        "remove-size":  "Återställ textstorlek",
+
+        /* Imagemanager/Filemanager plugin */
+        "choose": "Välj",
+
+        /* Alignment plugin */
+        "align": "Justera",
+    	"align-left": "Vänsterjustera",
+    	"align-center": "Mittenjustera",
+    	"align-right": "Högerjustera",
+    	"align-justify": "Marginaljustera",
+
+        /* Video plugin */
+        "video": "Video",
+        "video-html-code": "Inbäddningslänk eller Youtube/Vimeo länk"
+
     };
 })(Redactor);
diff --git a/lib/redactor/redactor.css b/lib/redactor/redactor.css
@@ -1072,7 +1072,7 @@
     .redactor-styles[dir="rtl"] ol ol,
     .redactor-styles[dir="rtl"] ul ol,
     .redactor-styles[dir="rtl"] ol ul {
-      margin: 0 1.5em 0 0; }
+      margin-left: 1.5em; }
     .redactor-styles[dir="rtl"] figcaption {
       text-align: right; }
   .redactor-styles ul[dir="rtl"],
@@ -1081,7 +1081,7 @@
   .redactor-styles ol[dir="rtl"],
   .redactor-styles ol[dir="rtl"] ul,
   .redactor-styles ol[dir="rtl"] ol {
-    margin: 0 1.5em 0 0; }
+    margin-right: 1.5em; }
   .redactor-styles ul[dir="rtl"] li,
   .redactor-styles ol[dir="rtl"] li {
     text-align: right; }