diff --git a/plugins/multiselect/BulkImport.php b/plugins/multiselect/BulkImport.php index b42fb88..9c2ea28 100755 --- a/plugins/multiselect/BulkImport.php +++ b/plugins/multiselect/BulkImport.php @@ -65,11 +65,12 @@ class InetBulkImportFolderMultiSelectAction extends KTFolderAction { $js .= ""; $aJavascript[] = 'thirdpartyjs/jquery/jquery-1.3.2.js'; + $aJavascript[] = 'thirdpartyjs/jquery/jquery_noconflict.js'; + $oPage =& $GLOBALS['main']; if (method_exists($oPage, 'requireJSResources')) { $oPage->requireJSResources($aJavascript); } - return $js._kt('Import from Server Location'); } else diff --git a/plugins/multiselect/BulkUpload.php b/plugins/multiselect/BulkUpload.php index db2aaa6..e9a56e5 100755 --- a/plugins/multiselect/BulkUpload.php +++ b/plugins/multiselect/BulkUpload.php @@ -67,6 +67,7 @@ class InetBulkUploadFolderAction extends KTFolderAction { if(!KTPluginUtil::pluginIsActive('inet.foldermetadata.plugin')) { $aJavascript[] = 'thirdpartyjs/jquery/jquery-1.3.2.js'; + $aJavascript[] = 'thirdpartyjs/jquery/jquery_noconflict.js'; $oPage =& $GLOBALS['main']; if (method_exists($oPage, 'requireJSResources')) { diff --git a/thirdpartyjs/jquery/jquery_noconflict.js b/thirdpartyjs/jquery/jquery_noconflict.js new file mode 100644 index 0000000..f4b1f44 --- /dev/null +++ b/thirdpartyjs/jquery/jquery_noconflict.js @@ -0,0 +1 @@ +jQuery.noConflict();