Merge branch 'dev' into master

.gitignore

+checklist.md5
\ No newline at end of file

bin/Editor.js

@@ -829,6 +829,8 @@ define('package/quiqqer/ckeditor4/bin/Editor', [
                 oldOnShow = dialogDefinition.onShow;
 
 
+            self.$turnLinkRelInputToSelect(dialogDefinition);
+
             // Get a reference to the "Link Info" tab.
             dialogDefinition.onShow = function () {
                 oldOnShow.bind(this)();
@@ -1013,6 +1015,51 @@ define('package/quiqqer/ckeditor4/bin/Editor', [
             };
 
             return ev;
+        },
+
+        /**
+         * Turns the "relation" text-input to a select-input.
+         * Returns as a boolean if the operation was successful.
+         *
+         * @see "quiqqer/ckeditor4#28"
+         *
+         * @param DialogDefinition
+         *
+         * @return boolean
+         */
+        $turnLinkRelInputToSelect: function(DialogDefinition) {
+            var AdvancedTab   = DialogDefinition.getContents("advanced");
+
+            if (!AdvancedTab) {
+                return false;
+            }
+
+            var RelationInput = AdvancedTab.get('advRel');
+
+            if (!RelationInput) {
+                return false;
+            }
+
+            if (RelationInput) {
+                RelationInput.type = 'select';
+                RelationInput.items = [
+                    ['alternate'],
+                    ['author'],
+                    ['bookmark'],
+                    ['external'],
+                    ['help'],
+                    ['license'],
+                    ['next'],
+                    ['nofollow'],
+                    ['noreferrer'],
+                    ['noopener'],
+                    ['prev'],
+                    ['search'],
+                    ['tag']
+                ];
+            }
+
+            return true;
         }
 
     });

bin/backend/controls/UploadWindow.js

+/**
+ * @module package/quiqqer/ckeditor4/bin/backend/controls/UploadWindow
+ */
 define('package/quiqqer/ckeditor4/bin/backend/controls/UploadWindow', [
 
     'qui/QUI',
     'qui/controls/windows/Confirm',
     'Locale',
     'controls/upload/Form'
+
 ], function (QUI, QUIConfirm, QUILocale, UploadForm) {
     "use strict";
 
-
     return new Class({
 
         Extends: QUIConfirm,
@@ -42,10 +45,9 @@ define('package/quiqqer/ckeditor4/bin/backend/controls/UploadWindow', [
             this.parent(options);
 
             this.addEvents({
-                onOpen: this.$onOpen,
+                onOpen  : this.$onOpen,
                 onSubmit: this.$onSubmit
             });
-
         },
 
         /**
@@ -71,22 +73,28 @@ define('package/quiqqer/ckeditor4/bin/backend/controls/UploadWindow', [
 
             this.$Upload.inject(Content);
 
-            var description = new Element("div", {
+            new Element("div", {
                 "html" : QUILocale.get("quiqqer/ckeditor4", "message.settings.upload.warning.external"),
                 "class": "content-message-attention",
                 "style": "margin-top: 10px;"
-            });
-            description.inject(Content);
-
+            }).inject(Content);
         },
 
-
+        /**
+         * event: on complete
+         */
         $onSubmit: function () {
             this.$Upload.submit();
         },
 
+        /**
+         * event: on complete
+         *
+         * @param Form
+         * @param File
+         * @param result
+         */
         $onComplete: function (Form, File, result) {
-
             QUI.MessageHandler.addSuccess(
                 QUILocale.get("quiqqer/ckeditor4", "message.window.upload.complete")
             );
@@ -95,6 +103,5 @@ define('package/quiqqer/ckeditor4/bin/backend/controls/UploadWindow', [
 
             this.close();
         }
-
     });
 });

checklist.md5

-13f0c2edd87644aadb6e964afded3e0c  composer.json
-1475dd243ea98e1d4c3450c996cb4eeb  ajax/deactivatePlugin.php
-3e988b01f5e7459c133209c200d84a6f  bin/defaultWysiwyg.css
-429efbb96844210f0d0bf70499849138  ajax/uninstallPlugin.php
-57637cb7ef2e48295ba77cfacbf609af  src/QUI/Ckeditor/Plugins/Manager.php
-5b49bec76fe68e69db9130c55175a953  bin/Editor.js
-686eaf44c5fec33c30250447af6217b1  ajax/installPlugin.php
-7734c8b62d016457e71b57accb3c5350  bin/Editor.css
-adac1ee419a8d29538b4d6495b0a4c75  README.md
-ae791a7b288e8abf8ea9bee2719e22c9  locale.xml
-b234ee4d69f5fce4486a80fdaf4a4263  LICENSE
-c2d12d54ab678a2f95667c7ca421eb98  ajax/activatePlugin.php
-d7c5658381f5003dfe13b8c3fd3460ec  package.xml
-dd6c0092b186bfa7a9957ce495abaf7d  wysiwyg.xml