Browse Source

Add "multiselect-two-sides" js lib using yarn

Julio Montoya 6 years ago
parent
commit
7217792f5f

+ 1 - 1
assets/js/vendor.js

@@ -14,7 +14,7 @@ require("webpack-jquery-ui/css");
 require("bootstrap");
 require("chosen-js");
 require("mediaelement");
-
+require("multiselect-two-sides");
 require('@fortawesome/fontawesome-free');
 
 require("qtip2");

+ 2 - 1
main/inc/lib/pear/HTML/QuickForm/advmultiselect.php

@@ -913,7 +913,8 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
     public function getElementJs($raw = true, $min = true)
     {
         $name = $this->getName();
-        $js = api_get_asset('multiselect-two-sides/dist/js/multiselect.js');
+        //$js = api_get_asset('multiselect-two-sides/dist/js/multiselect.js');
+        $js = '';
         $search =
         '<input type="text" name="q" class="form-control" placeholder="'.addslashes(get_lang('Search')).'" /><br />';
 

+ 1 - 1
main/social/group_invitation.php

@@ -159,7 +159,7 @@ if (count($nosessionUsersList) == 0) {
     $social_right_content .= '<br />';
 }
 
-$form = new FormValidator('invitation', 'post', api_get_self().'?id='.$group_id);
+$form = new FormValidator('group_invitation', 'post', api_get_self().'?id='.$group_id);
 $form->addHidden('form_sent', 1);
 $form->addHidden('id', $group_id);
 

+ 1 - 1
main/social/group_view.php

@@ -240,7 +240,7 @@ if ($is_group_member || $group_info['visibility'] == GROUP_PERMISSION_OPEN) {
 
     // My friends
     $friend_html = SocialManager::listMyFriendsBlock(
-        $user_id,
+        api_get_user_id(),
         '',
         ''
     );

+ 1 - 0
package.json

@@ -35,6 +35,7 @@
     "mathjax": "^2.7.4",
     "mediaelement": "^4.2.9",
     "moment": "^2.22",
+    "multiselect-two-sides": "^2.5.5",
     "mxgraph": "^3.9.3",
     "qtip2": "^3.0.3",
     "select2": "^4.0.6-rc.1",

+ 7 - 1
yarn.lock

@@ -3461,7 +3461,7 @@ jquery.scrollbar@^0.2.11:
   version "0.2.11"
   resolved "https://registry.yarnpkg.com/jquery.scrollbar/-/jquery.scrollbar-0.2.11.tgz#e91bd4a97d83859463024d26e730dc36676ab59d"
 
-jquery@>=1.10, jquery@>=1.2.3, jquery@>=1.6.0, jquery@>=2.0.0, jquery@^3.2.1, jquery@^3.3.1:
+jquery@>=1.10, jquery@>=1.2.3, jquery@>=1.6.0, jquery@>=1.7, jquery@>=2.0.0, jquery@^3.2.1, jquery@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
 
@@ -4068,6 +4068,12 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
+multiselect-two-sides@^2.5.5:
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/multiselect-two-sides/-/multiselect-two-sides-2.5.5.tgz#447053260f6a5b0b56e2130ac38f6dc10a417f07"
+  dependencies:
+    jquery ">=1.7"
+
 mxgraph@^3.9.3:
   version "3.9.3"
   resolved "https://registry.yarnpkg.com/mxgraph/-/mxgraph-3.9.3.tgz#2d1ece1472ce49585b6a028bd4ed4d332eafc260"