Julian/phpbb_mchat_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29 from kasimi/fix-remove-duplicate-jquery

Browse Source 
Remove duplicate jquery
This commit is contained in:
dmzx
2015-12-14 12:55:16 +01:00
parent d42e81cd3f 4bda025480
commit db0967a5d8
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
styles/prosilver/template/jquery-1.8.3.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
styles/prosilver/template/mchat_ajax_mini.js
View File

@@ -8,7 +8,7 @@
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* *
**/ **/
var $jQ=jQuery.noConflict(true); var $jQ=jQuery;
var hasFocus = true; var hasFocus = true;
$jQ(function(){ $jQ(function(){
if(!mChatArchiveMode){ if(!mChatArchiveMode){
@@ -92,6 +92,7 @@ $jQ(function(){
$jQ('#mChatUserList').show() $jQ('#mChatUserList').show()
} }
} }
$jQ.browser = {msie: navigator.userAgent.match(/MSIE ([0-9]+)\./) || navigator.userAgent.match(/Trident\/7.0; rv 11.0/)};
}); });
var mChat={ var mChat={
key:function(e){ key:function(e){
@@ -154,7 +155,7 @@ var mChat={
if ($jQ.cookie('mChatNoSound') == 'yes') { if ($jQ.cookie('mChatNoSound') == 'yes') {
return return
} }
if (false || $.browser.msie) { if ($jQ.browser.msie) {
$('#mChatSound').html('<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0" height="0" width="0" type="application/x-shockwave-flash"><param name="movie" value="' + file + '"></object>'); $('#mChatSound').html('<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0" height="0" width="0" type="application/x-shockwave-flash"><param name="movie" value="' + file + '"></object>');
} else { } else {
$('#mChatSound').html('<embed src="' + file + '" width="0" height="0" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"></embed>'); $('#mChatSound').html('<embed src="' + file + '" width="0" height="0" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"></embed>');

1
styles/prosilver/template/mchat_body.html
View File

@@ -10,7 +10,6 @@
<!-- ELSE --> <!-- ELSE -->
<!-- INCLUDEJS mchat_ajax_mini_top.js --> <!-- INCLUDEJS mchat_ajax_mini_top.js -->
<!-- ENDIF --> <!-- ENDIF -->
<!-- INCLUDEJS jquery-1.8.3.min.js -->
<!-- INCLUDEJS jquery.maxlength.min.js --> <!-- INCLUDEJS jquery.maxlength.min.js -->
<!-- IF MCHAT_ARCHIVE_MODE --> <!-- IF MCHAT_ARCHIVE_MODE -->