Merge pull request #12005 from owncloud/bower-multiselect

Move multiselect to user_ldap

5 files changed, 23 insertions, 3 deletions

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 2a555ad28f6..f66c1b86eac 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -2,6 +2,7 @@ filter:
     excluded_paths:
         - '3rdparty/*'
         - 'apps/*/3rdparty/*'
+        - 'apps/*/vendor/*'
         - 'l10n/*'
         - 'core/l10n/*'
         - 'apps/*/l10n/*'
@@ -13,7 +14,6 @@ filter:
         - 'core/js/jquery-tipsy.js'
         - 'core/js/jquery-ui-1.10.0.custom.js'
         - 'core/js/placeholders.js'
-        - 'core/js/jquery.multiselect.js'
 
 
 imports:
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index ca61a53b196..3b448aec757 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -28,9 +28,9 @@ OC_Util::checkAdminUser();
 OCP\Util::addScript('user_ldap', 'ldapFilter');
 OCP\Util::addScript('user_ldap', 'experiencedAdmin');
 OCP\Util::addScript('user_ldap', 'settings');
-OCP\Util::addScript('core', 'jquery.multiselect');
+\OC_Util::addVendorScript('user_ldap', 'ui-multiselect/src/jquery.multiselect');
 OCP\Util::addStyle('user_ldap', 'settings');
-OCP\Util::addStyle('core', 'jquery.multiselect');
+\OC_Util::addVendorStyle('user_ldap', 'ui-multiselect/jquery.multiselect');
 OCP\Util::addStyle('core', 'jquery-ui-1.10.0.custom');
 
 // fill template
diff --git a/apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE b/apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE
new file mode 100644
index 00000000000..2dc8e79e3ad
--- /dev/null
+++ b/apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2011 Eric Hynds
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/core/css/jquery.multiselect.css b/apps/user_ldap/vendor/ui-multiselect/jquery.multiselect.css
index 9b81c3bdcfb..9b81c3bdcfb 100644
--- a/core/css/jquery.multiselect.css
+++ b/apps/user_ldap/vendor/ui-multiselect/jquery.multiselect.css
diff --git a/core/js/jquery.multiselect.js b/apps/user_ldap/vendor/ui-multiselect/src/jquery.multiselect.js
index 16ae4264177..16ae4264177 100644
--- a/core/js/jquery.multiselect.js
+++ b/apps/user_ldap/vendor/ui-multiselect/src/jquery.multiselect.js