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

Replaced Apprise plugin with phpBB native confirm dialog

Browse Source
This commit is contained in:
kasimi
2015-12-18 20:48:42 +01:00
parent a2234c574d
commit ff66f924e0
5 changed files with 151 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/render_helper.php
View File

@@ -1129,7 +1129,7 @@ class render_helper
'MCHAT_MESSAGE_LNGTH' => $this->config_mchat['max_message_lngth'],
'L_MCHAT_MESSAGE_LNGTH_EXPLAIN' => (intval($this->config_mchat['max_message_lngth'])) ? sprintf($this->user->lang['MCHAT_MESSAGE_LNGTH_EXPLAIN'], intval($this->config_mchat['max_message_lngth'])) : '',
'MCHAT_MESS_LONG' => sprintf($this->user->lang['MCHAT_MESS_LONG'], $this->config_mchat['max_message_lngth']),
'MCHAT_USER_TIMEOUT' => $this->config_mchat['timeout'] ? 1000 * $this->config_mchat['timeout'] : false,
'MCHAT_USER_TIMEOUT' => 1000 * $this->config_mchat['timeout'],
'MCHAT_WHOIS_REFRESH' => 1000 * $this->config_mchat['whois_refresh'],
'MCHAT_PAUSE_ON_INPUT' => $this->config_mchat['pause_on_input'] ? true : false,
'L_MCHAT_ONLINE_EXPLAIN' => $this->functions_mchat->mchat_session_time($mchat_session_time),

205
styles/prosilver/template/mchat.js
View File

@@ -30,7 +30,7 @@ jQuery(function($) {
scrollTop: $("#mChatmain")[0].scrollHeight
}, 1000, "swing");
}
if (mChat.pause) {
if (!mChat.archiveMode && mChat.pause) {
$("#mChatMessage").on("keypress", function() {
clearInterval(mChat.interval);
$("#mChatLoadIMG,#mChatOkIMG,#mChatErrorIMG").hide();
@@ -141,7 +141,7 @@ jQuery(function($) {
var answer = confirm(mChat.reset);
if (answer) {
$("#mChatRefreshText").removeClass("mchat-alert");
if (mChat.pause) {
if (!mChat.archiveMode && mChat.pause) {
mChat.interval = setInterval(mChat.refresh, mChat.refreshTime);
}
$("#mChatOkIMG").show();
@@ -156,6 +156,7 @@ jQuery(function($) {
if ($.cookie("mChatNoSound") == "yes") {
return;
}
file = mChat.extUrl + "sounds/" + file + ".swf";
if (navigator.userAgent.match(/MSIE ([0-9]+)\./) || navigator.userAgent.match(/Trident\/7.0; rv 11.0/)) {
$("#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 {
@@ -216,7 +217,7 @@ jQuery(function($) {
$("#submit_button").removeAttr("disabled");
mChat.interval = setInterval(mChat.refresh, mChat.refreshTime);
if (mChat.userTimeout) {
mChat.sessionTime = mChat.userTimeout ? mChat.userTimeout / 1000 : false;
mChat.sessionTime = mChat.userTimeout / 1000;
mChat.counter = setInterval(mChat.countDown, 1000);
mChat.activeInterval = setInterval(mChat.active, mChat.userTimeout);
}
@@ -225,15 +226,10 @@ jQuery(function($) {
});
},
edit: function() {
var id = $(this).closest('.mChatHover').data("id");
var message = $("#mess" + id).data("edit");
apprise(mChat.editInfo, {
"textarea": message,
"animate": true,
"position": 200,
"confirm": true
}, function(r) {
if (r) {
var id = $(this).closest(".mChatHover").data("id");
var $message = mChat.confirmContainer.find("textarea").show().val($("#mess" + id).data("edit"));
mChat.confirmContainer.find("p").text(mChat.editInfo);
phpbb.confirm(mChat.confirmContainer, function() {
$.ajax({
url: mChat.file,
timeout: 10000,
@@ -241,7 +237,7 @@ jQuery(function($) {
data: {
mode: "edit",
message_id: id,
message: r
message: $message.val()
},
dataType: "text",
beforeSend: function() {
@@ -279,17 +275,13 @@ jQuery(function($) {
}
}
});
}
});
},
del: function() {
var id = $(this).closest('.mChatHover').data("id");
apprise(mChat.delConfirm, {
"position": 200,
"animate": true,
"confirm": true
}, function(del) {
if (del) {
var id = $(this).closest(".mChatHover").data("id");
mChat.confirmContainer.find("textarea").hide();
mChat.confirmContainer.find("p").text(mChat.delConfirm);
phpbb.confirm(mChat.confirmContainer, function() {
$.ajax({
url: mChat.file,
timeout: 10000,
@@ -310,7 +302,7 @@ jQuery(function($) {
$("#mess" + id).fadeOut("slow", function() {
$(this).remove();
});
mChat.sound(mChat.forumRoot + "ext/dmzx/mchat/sounds/del.swf");
mChat.sound("del");
},
error: function() {
alert(mChat.noAccess);
@@ -324,9 +316,6 @@ jQuery(function($) {
}
}
});
} else {
return false;
}
});
},
refresh: function() {
@@ -367,7 +356,7 @@ jQuery(function($) {
}
$html.fadeIn("slow");
$("#mChatmain").stop().animate({scrollTop: mChat.messageTop ? 0 : $("#mChatmain")[0].scrollHeight}, 2000);
mChat.sound(mChat.forumRoot + "ext/dmzx/mchat/sounds/add.swf");
mChat.sound("add");
mChat.notice();
}
setTimeout(function() {
@@ -379,7 +368,7 @@ jQuery(function($) {
error: function() {
$("#mChatLoadIMG,#mChatOkIMG,#mChatPauseIMG,#mChatRefreshTextNo").hide();
$("#mChatErrorIMG").show();
mChat.sound(mChat.forumRoot + "ext/dmzx/mchat/sounds/error.swf");
mChat.sound("error");
},
complete: function() {
if (!$("#mChatData").children(firstLastSelector).length) {
@@ -389,9 +378,6 @@ jQuery(function($) {
});
},
stats: function() {
if (!mChat.whois) {
return;
}
$.ajax({
url: mChat.file,
timeout: 10000,
@@ -417,7 +403,7 @@ jQuery(function($) {
}
},
error: function() {
mChat.sound(mChat.forumRoot + "ext/dmzx/mchat/sounds/error.swf");
mChat.sound("error");
},
complete: function() {
if ($("#mChatUserList").length && ($.cookie("mChatShowUserList") == "yes" || mChat.customPage)) {
@@ -437,7 +423,7 @@ jQuery(function($) {
$("#mChatSessMess").html(mChat.sessOut).addClass("mchat-alert");
},
insertMention: function() {
var $msg = $(this).closest('.mChatHover');
var $msg = $(this).closest(".mChatHover");
var username = mChat.entityDecode($msg.data("username"));
var usercolor = $msg.data("usercolor");
if (usercolor) {
@@ -448,14 +434,14 @@ jQuery(function($) {
insert_text("@ " + username + ", ");
},
insertQuote: function() {
var $msg = $(this).closest('.mChatHover');
var $msg = $(this).closest(".mChatHover");
var username = mChat.entityDecode($msg.data("username"));
var id = $msg.data("id");
var quote = mChat.entityDecode($("#mess" + id).data("edit"));
insert_text('[quote="' + username + '"]' + quote + '[/quote]');
},
insertLike: function() {
var $msg = $(this).closest('.mChatHover');
var $msg = $(this).closest(".mChatHover");
var username = mChat.entityDecode($msg.data("username"));
var quote = mChat.entityDecode($msg.data("edit"));
insert_text(mChat.likes + '[quote="' + username + '"]' + quote + "[/quote]");
@@ -464,23 +450,27 @@ jQuery(function($) {
var s = decodeURIComponent(text.replace(/\+/g, " "));
s = s.replace(/&lt;/g, "<");
s = s.replace(/&gt;/g, ">");
s = s.replace(/&#58;/g, ':');
s = s.replace(/&#46;/g, '.');
s = s.replace(/&amp;/g, '&');
s = s.replace(/&#58;/g, ":");
s = s.replace(/&#46;/g, ".");
s = s.replace(/&amp;/g, "&");
s = s.replace(/&quot;/g, '"');
return s;
}
});
mChat.interval = setInterval(mChat.refresh, mChat.refreshTime);
mChat.statsInterval = setInterval(mChat.stats, mChat.whoisRefresh);
mChat.activeInterval = setInterval(mChat.active, mChat.userTimeout);
mChat.sessionTime = mChat.userTimeout ? mChat.userTimeout / 1000 : false;
mChat.confirmContainer = $("#mChatConfirm").detach().show();
if (mChat.userTimeout) {
mChat.counter = setInterval(mChat.countDown, 1000);
}
if (mChat.whois) {
mChat.statsInterval = setInterval(mChat.stats, mChat.whoisRefresh);
}
if ($.cookie("mChatShowSmiles") == "yes" && $("#mChatSmiles").css("display", "none")) {
$("#mChatSmiles").slideToggle("slow");
}
@@ -507,143 +497,4 @@ jQuery(function($) {
.on("click", "img.mChatInsertLike", mChat.insertLike)
.on("click", "img.mChatEdit", mChat.edit)
.on("click", "img.mChatDelete", mChat.del);
// Apprise 1.5 by Daniel Raftery
// http://thrivingkings.com/apprise
//
// Button text added by Adam Bezulski
//
// Cached jQuery variables, position center added by Josiah Ruddell
function apprise(a, b, c) {
a = '<span style="font-weight:bold; font-size:1.2em;">' + a + "</span>";
var d = {
confirm: false,
verify: false,
input: false,
textarea: false,
animate: false,
textOk: "Ok",
textCancel: "Cancel",
textYes: "Yes",
textNo: "No",
position: "center"
};
if (b) {
for (var e in d) {
if (typeof b[e] == "undefined") b[e] = d[e];
}
}
var f = $(document).height(),
g = $(document).width(),
h = $('<div class="appriseOuter"></div>'),
i = $('<div class="appriseOverlay" id="aOverlay"></div>'),
j = $('<div class="appriseInner"></div>'),
k = $('<div class="aButtons"></div>'),
l = 300;
i.css({
height: f,
width: g
}).appendTo("body").fadeIn(100, function() {
$(this).css("filter", "alpha(opacity=70)");
});
h.prependTo("body");
j.append(a).appendTo(h);
if (b) {
if (b.input) {
if (typeof b.input == "string") {
j.append('<div class="aInput"><input type="text" class="aTextbox" t="aTextbox" value="' + b.input + '" /></div>');
} else {
j.append('<div class="aInput"><input type="text" class="aTextbox" t="aTextbox" /></div>');
}
$(".aTextbox").focus();
}
if (typeof b.textarea == "string") {
j.append('<div class="aInput"><textarea name="message" class="aEdit" style="height: 9em;" rows="5" cols="180">' + b.textarea + "</textarea></div>");
$(".aEdit").focus();
}
}
j.append(k);
if (b) {
if (b.confirm || b.input) {
k.append('<button value="ok">' + b.textOk + "</button>");
k.append('<button value="cancel">' + b.textCancel + "</button>");
} else if (b.verify) {
k.append('<button value="ok">' + b.textYes + "</button>");
k.append('<button value="cancel">' + b.textNo + "</button>");
} else {
k.append('<button value="ok">' + b.textOk + "</button>");
}
} else {
k.append('<button value="ok">Ok</button>');
}
h.css("left", ($(window).width() - $(".appriseOuter").width()) / 2 + $(window).scrollLeft() + "px");
if (b) {
if (b.position && b.position === "center") {
l = (f - h.height()) / 2;
}
if (b.animate) {
var m = b.animate;
if (isNaN(m)) {
m = 400;
}
h.css("top", "-200px").show().animate({
top: l
}, m);
} else {
h.css("top", l).fadeIn(200);
}
} else {
h.css("top", l).fadeIn(200);
}
$(document).keydown(function(a) {
if (i.is(":visible")) {
if (a.shiftKey && a.keyCode == 13) {
$(".aEdit").append("<br />");
} else if (a.keyCode == 13) {
$('.aButtons > button[value="ok"]').click();
} else if (a.keyCode == 27) {
$('.aButtons > button[value="cancel"]').click();
}
}
});
var n = $(".aTextbox").val();
if (!n) {
n = false;
}
$(".aTextbox").on("keydown blur", function() {
n = $(this).val();
});
var o = $(".aEdit").val();
if (!o) {
o = false;
}
$(".aEdit").on("keydown blur", function() {
o = $(this).val();
});
$(".aButtons > button").click(function() {
i.remove();
h.remove();
if (c) {
$(this).text("");
var a = $(this).attr("value");
if (a == "ok") {
if (b) {
if (b.input) {
c(n);
} else if (b.textarea) {
c(o);
} else {
c(true);
}
} else {
c(true);
}
$("#mChatMessage").focus();
} else if (a == "cancel") {
c(false);
$("#mChatMessage").focus();
}
}
});
}
});

2
styles/prosilver/template/mchat.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -49,11 +49,11 @@
messageTop : <!-- IF MCHAT_MESSAGE_TOP -->true<!-- ELSE -->false<!-- ENDIF -->,
noMessage : '{MCHAT_NOMESSAGE_MODE}',
file : '{MCHAT_FILE_NAME}',
forumRoot : '{ROOT_PATH}',
customPage : '{MCHAT_CUSTOM_PAGE}',
pause : <!-- IF not MCHAT_ARCHIVE_MODE -->'{MCHAT_PAUSE_ON_INPUT}'<!-- ELSE -->false<!-- ENDIF -->,
refreshTime : <!-- IF not MCHAT_ARCHIVE_MODE -->'{MCHAT_REFRESH_JS}'<!-- ELSE -->false<!-- ENDIF -->,
userTimeout : <!-- IF MCHAT_USER_TIMEOUT -->'{MCHAT_USER_TIMEOUT}'<!-- ELSE -->false<!-- ENDIF -->,
extUrl : '{EXT_URL}',
customPage : <!-- IF MCHAT_CUSTOM_PAGE -->true<!-- ELSE -->false<!-- ENDIF -->,
pause : <!-- IF MCHAT_PAUSE_ON_INPUT -->true<!-- ELSE -->false<!-- ENDIF -->,
refreshTime : {MCHAT_REFRESH_JS},
userTimeout : {MCHAT_USER_TIMEOUT},
newMessageAlert : '{LA_MCHAT_NEW_CHAT}',
noMessageInput : '{LA_MCHAT_NOMESSAGEINPUT}',
noMessages : '{LA_MCHAT_NOMESSAGE}',
@@ -69,10 +69,10 @@
refreshNo : '{LA_MCHAT_REFRESH_NO}',
mssgLngthLong : '{MCHAT_MESS_LONG}',
likes : '{LA_MCHAT_LIKES}',
mssgLngth : <!-- IF MCHAT_MESSAGE_LNGTH -->'{MCHAT_MESSAGE_LNGTH}'<!-- ELSE -->false<!-- ENDIF -->,
mssgLngth : {MCHAT_MESSAGE_LNGTH},
playSound : <!-- IF S_MCHAT_SOUND_YES -->true<!-- ELSE -->false<!-- ENDIF -->,
whois : <!-- IF MCHAT_WHOIS -->true<!-- ELSE -->false<!-- ENDIF -->,
whoisRefresh : <!-- IF MCHAT_WHOIS -->'{MCHAT_WHOIS_REFRESH}'<!-- ELSE -->false<!-- ENDIF -->,
whoisRefresh : {MCHAT_WHOIS_REFRESH},
focusFix : <!-- IF MCHAT_ARCHIVE_MODE -->false<!-- ELSE -->true<!-- ENDIF -->,
archiveMode : <!-- IF MCHAT_ARCHIVE_MODE -->true<!-- ELSE -->false<!-- ENDIF -->
};
@@ -83,6 +83,15 @@
<div id="mChatmain" <!-- IF MCHAT_CUSTOM_PAGE -->class="mChatRowLimitCustom" style="height: {MCHAT_CUSTOM_HEIGHT}px;"<!-- ELSE -->class="mChatRowLimit" style="height: {MCHAT_INDEX_HEIGHT}px;"<!-- ENDIF -->>
<!-- ENDIF -->
<div id="mChatData">
<div id="mChatConfirm" class="hidden">
<h3>{L_CONFIRM}</h3>
<p></p>
<textarea></textarea>
<fieldset class="submit-buttons">
<input type="button" name="confirm" value="{L_MCHAT_OK}" class="button2" />&nbsp;
<input type="button" name="cancel" value="{L_CANCEL}" class="button2" />
</fieldset>
</div>
<!-- ENDIF -->
<!-- INCLUDE mchat_messages.html -->
<!-- IF not MCHAT_READ_MODE -->
@@ -135,10 +144,10 @@
<!-- ENDIF -->
<!-- EVENT dmzx_mchat_body_smiley_after -->
<div style="padding: 3px;">
<img src="{ROOT_PATH}ext/dmzx/mchat/styles/prosilver/theme/images/load.gif" alt="{L_MCHAT_LOAD}" title="{L_MCHAT_LOAD}" id="mChatLoadIMG" class="mChatImageLoad" />
<img src="{ROOT_PATH}ext/dmzx/mchat/styles/prosilver/theme/images/ok.gif" alt="{L_MCHAT_OK}" title="{L_MCHAT_OK}" id="mChatOkIMG" class="mChatImageOk" />
<img src="{ROOT_PATH}ext/dmzx/mchat/styles/prosilver/theme/images/error.gif" alt="{L_MCHAT_ERROR}" title="{L_MCHAT_ERROR}" id="mChatErrorIMG" class="mChatImageHideImg" />
<img src="{ROOT_PATH}ext/dmzx/mchat/styles/prosilver/theme/images/paused.gif" alt="{L_MCHAT_PAUSE}" title="{L_MCHAT_PAUSE}" id="mChatPauseIMG" class="mChatImageHideImg" />
<img src="{EXT_URL}styles/prosilver/theme/images/load.gif" alt="{L_MCHAT_LOAD}" title="{L_MCHAT_LOAD}" id="mChatLoadIMG" class="mChatImageLoad" />
<img src="{EXT_URL}styles/prosilver/theme/images/ok.gif" alt="{L_MCHAT_OK}" title="{L_MCHAT_OK}" id="mChatOkIMG" class="mChatImageOk" />
<img src="{EXT_URL}styles/prosilver/theme/images/error.gif" alt="{L_MCHAT_ERROR}" title="{L_MCHAT_ERROR}" id="mChatErrorIMG" class="mChatImageHideImg" />
<img src="{EXT_URL}styles/prosilver/theme/images/paused.gif" alt="{L_MCHAT_PAUSE}" title="{L_MCHAT_PAUSE}" id="mChatPauseIMG" class="mChatImageHideImg" />
<span id="mChatRefreshText">{MCHAT_REFRESH_YES}</span><!-- IF MCHAT_USER_TIMEOUT --> &bull; <span id="mChatSessMess">&nbsp;</span><!-- ENDIF --> &bull; <label for="mChatUseSound">{L_MCHAT_USESOUND} <input type="checkbox" id="mChatUseSound" <!-- IF S_MCHAT_SOUND_YES -->checked="checked"<!-- ENDIF --> /></label>
{L_MCHAT_COPYRIGHT}
</div>

131
styles/prosilver/theme/mchat.css
View File

@@ -6,17 +6,9 @@
*
*/
/* mChat
------------ */
div.mChatBG1 {
background: -webkit-linear-gradient(#B6BFC4, #FFFFFF, #FFFFFF, #B6BFC4);
background: -o-linear-gradient(#B6BFC4, #FFFFFF, #FFFFFF, #B6BFC4);
background: -moz-linear-gradient(#B6BFC4, #FFFFFF, #FFFFFF, #B6BFC4);
background: linear-gradient(#B6BFC4, #FFFFFF, #FFFFFF, #B6BFC4);
border: 1px solid #999999;
-webkit-border-radius: 6px;
-o-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
padding: 5px;
color: #333333;
@@ -25,14 +17,8 @@ div.mChatBG1 {
}
div.mChatBG2 {
background: -webkit-linear-gradient(#B6BFC4, #FFFFFF, #FFFFFF, #B6BFC4);
background: -o-linear-gradient(#B6BFC4, #FFFFFF, #FFFFFF, #B6BFC4);
background: -moz-linear-gradient(#B6BFC4, #FFFFFF, #FFFFFF, #B6BFC4);
background: linear-gradient(#B6BFC4, #FFFFFF, #FFFFFF, #B6BFC4);
border: 1px solid #999999;
-webkit-border-radius: 6px;
-o-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
padding: 5px;
color: #444444;
@@ -128,10 +114,11 @@ div.mChatMessage blockquote {
}
a.mChatScriptLink {
text-decoration:none;
text-decoration: none;
}
img.mChatImage{
img.mChatImage {
margin-top: -4px;
vertical-align: middle;
}
@@ -191,113 +178,7 @@ div.avatarMessage {
margin-right: 5px;
}
.appriseOverlay
{
position:fixed;
top:0;
left:0;
background:rgba(0, 0, 0, 0.3);
display:none;
}
.appriseOuter
{
background:#dcdee2;
border:1px solid #fff;
box-shadow:0px 3px 7px #333;
-moz-box-shadow:0px 3px 7px #333;
-webkit-box-shadow:0px 3px 7px #333;
-moz-border-radius:4px;
-webkit-border-radius:4px;
border-radius:4px;
-khtml-border-radius:4px;
position:absolute;
z-index:99999999;
min-width:200px;
min-height:50px;
max-width:75%;
position:fixed;
display:none;
}
.appriseInner
{
padding:20px;
color:#333;
text-shadow:0px 1px 0px #fff;
font-weight: bold;
}
.appriseInner button
{
border:1px solid #666666;
-moz-border-radius:3px;
-webkit-border-radius:3px;
border-radius:3px;
-khtml-border-radius:3px;
background: -moz-linear-gradient(100% 100% 90deg, #eee, #d5d5d5);
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#eee), to(#d5d5d5));
background: -webkit-linear-gradient(#eee, #d5d5d5);
background: -o-linear-gradient(#eee, #d5d5d5);
color:#000000;
font-size:12px;
font-weight:bold;
padding:4px 10px;
margin:0 3px;
text-shadow:0px 1px 0px #fff;
cursor:pointer;
box-shadow:0px 1px 2px #ccc;
-moz-box-shadow:0px 1px 2px #ccc;
-webkit-box-shadow:0px 1px 2px #ccc;
}
.appriseInner button:hover
{
color:#d85054;
}
.aButtons, .aInput
{
margin:20px 10px 0px 10px;
text-align:center;
}
.aTextbox
{
border:1px solid #aaa;
-moz-border-radius:4px;
-webkit-border-radius:4px;
border-radius:4px;
-khtml-border-radius:4px;
box-shadow:0px 1px 0px #fff;
-moz-box-shadow:0px 1px 0px #fff;
-webkit-box-shadow:0px 1px 0px #fff;
width:180px;
font-size:12px;
font-weight:bold;
padding:5px 10px;
}
.no-rgba .appriseOverlay{
opacity: .30;
filter: alpha(opacity = 30) !important;
background: #000;
zoom: 1;
}
.no-borderradius .appriseOuter{
border:1px solid #888;
}
.appriseOverlay {
background-color:#222222;
border:medium none;
cursor:wait;
height:100%;
left:0;
margin:0;
padding:0;
position:fixed;
top:0;
width:100%;
z-index:1000;
filter:alpha(opacity=70);
opacity:0.70;
}
/* Change buttons height
------------ */
.mChatImage {
margin-top: -4px;
#mChatConfirm textarea {
width: 100%;
height: 100px;
}