Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 15 Nov 2017 17:26:54 +0000 (18:26 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 15 Nov 2017 17:26:54 +0000 (18:26 +0100)
1  2 
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Link.js
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

index 96e16ed68690c0664cdab63336c22829dfb29068,4a66b58dd6a96fe31aec82ee51e0e4658032bf22..f1e3828709256a7327bb06d5393b7f7fa996e18a
@@@ -1,16 -1,6 +1,16 @@@
- define(['Language', 'Ui/Dialog'], function(Language, UiDialog) {
+ define(['Core', 'EventKey', 'Language', 'Ui/Dialog'], function(Core, EventKey, Language, UiDialog) {
        "use strict";
        
 +      if (!COMPILER_TARGET_DEFAULT) {
 +              var Fake = function() {};
 +              Fake.prototype = {
 +                      showDialog: function() {},
 +                      _submit: function() {},
 +                      _dialogSetup: function() {}
 +              };
 +              return Fake;
 +      }
 +      
        var _boundListener = false;
        var _callback = null;
        
Simple merge
Simple merge