From: Matthias Schmidt Date: Fri, 8 Jan 2016 17:08:45 +0000 (+0100) Subject: Fix media manager search issues X-Git-Tag: 3.0.0_Beta_1~2030^2~165^2~6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=036edbb40dfc2354b01c60a80f2b5a8069cefd3f;p=GitHub%2FWoltLab%2FWCF.git Fix media manager search issues --- diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Base.js b/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Base.js index 3a55f4ecbd..e21f3a4a69 100644 --- a/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Base.js +++ b/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Base.js @@ -2,22 +2,22 @@ * Provides the media manager dialog. * * @author Matthias Schmidt - * @copyright 2001-2015 WoltLab GmbH + * @copyright 2001-2016 WoltLab GmbH * @license GNU Lesser General Public License * @module WoltLab/WCF/Media/Manager/Base */ define( [ - 'Core', 'Dictionary', 'Dom/ChangeListener', 'Dom/Traverse', - 'Dom/Util', 'EventHandler', 'Language', 'List', - 'Permission', 'Ui/Dialog', 'Ui/Notification', 'WoltLab/WCF/Controller/Clipboard', - 'WoltLab/WCF/Media/Editor', 'WoltLab/WCF/Media/Upload', 'WoltLab/WCF/Media/Search' + 'Core', 'Dictionary', 'Dom/ChangeListener', 'Dom/Traverse', + 'Dom/Util', 'EventHandler', 'Language', 'List', + 'Permission', 'Ui/Dialog', 'Ui/Notification', 'WoltLab/WCF/Controller/Clipboard', + 'WoltLab/WCF/Media/Editor', 'WoltLab/WCF/Media/Upload', 'WoltLab/WCF/Media/Manager/Search' ], function( - Core, Dictionary, DomChangeListener, DomTraverse, - DomUtil, EventHandler, Language, List, - Permission, UiDialog, UiNotification, Clipboard, - MediaEditor, MediaUpload, MediaSearch + Core, Dictionary, DomChangeListener, DomTraverse, + DomUtil, EventHandler, Language, List, + Permission, UiDialog, UiNotification, Clipboard, + MediaEditor, MediaUpload, MediaManagerSearch ) { "use strict"; @@ -204,7 +204,7 @@ define( EventHandler.add('com.woltlab.wcf.clipboard', 'com.woltlab.wcf.media', this._clipboardAction.bind(this)); } - this._search = new MediaSearch(this); + this._search = new MediaManagerSearch(this); if (!listItems.length) { this._search.hideSearch(); diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Search.js b/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Search.js index b64d292041..fa1c08c6c5 100644 --- a/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Search.js +++ b/wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Search.js @@ -2,7 +2,7 @@ * Provides the media search for the media manager. * * @author Matthias Schmidt - * @copyright 2001-2015 WoltLab GmbH + * @copyright 2001-2016 WoltLab GmbH * @license GNU Lesser General Public License * @module WoltLab/WCF/Media/Manager/Search */ @@ -13,7 +13,7 @@ define(['Ajax', 'Core', 'Dom/Traverse', 'Dom/Util', 'Language', 'WoltLab/WCF/Med * @constructor */ function MediaManagerSearch(mediaManager) { - MediaSearch.call(); + MediaSearch.call(this); this._mediaManager = mediaManager; this._searchMode = false;