various testbubble fixes
This commit is contained in:
parent
20ca93191f
commit
d6d4d3ed3a
5 changed files with 39 additions and 30 deletions
|
@ -222,8 +222,9 @@ function initEditor(cb){
|
||||||
event.target.textContent = reply;
|
event.target.textContent = reply;
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
if(reply && reply.length) {
|
if(reply && reply.length) {
|
||||||
|
reply = bin2hex(reply);
|
||||||
$('#profile-rotator').show();
|
$('#profile-rotator').show();
|
||||||
$.get('parse_url?url=' + reply, function(data) {
|
$.get('parse_url?binurl=' + reply, function(data) {
|
||||||
if (!editor) $("#profile-jot-text").val("");
|
if (!editor) $("#profile-jot-text").val("");
|
||||||
initEditor(function(){
|
initEditor(function(){
|
||||||
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
||||||
|
|
|
@ -229,8 +229,9 @@ function initEditor(cb) {
|
||||||
event.target.textContent = reply;
|
event.target.textContent = reply;
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
if(reply && reply.length) {
|
if(reply && reply.length) {
|
||||||
|
reply = bin2hex(reply);
|
||||||
$('#profile-rotator').show();
|
$('#profile-rotator').show();
|
||||||
$.get('parse_url?url=' + reply, function(data) {
|
$.get('parse_url?binurl=' + reply, function(data) {
|
||||||
if (!editor) $("#profile-jot-text").val("");
|
if (!editor) $("#profile-jot-text").val("");
|
||||||
initEditor(function(){
|
initEditor(function(){
|
||||||
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
||||||
|
|
|
@ -32,16 +32,37 @@ function initEditor(cb) {
|
||||||
content_css: "$baseurl/view/custom_tinymce.css",
|
content_css: "$baseurl/view/custom_tinymce.css",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
setup : function(ed) {
|
setup : function(ed) {
|
||||||
//Character count
|
cPopup = null;
|
||||||
ed.onKeyUp.add(function(ed, e) {
|
ed.onKeyDown.add(function(ed,e) {
|
||||||
var txt = tinyMCE.activeEditor.getContent();
|
if(cPopup !== null)
|
||||||
textlen = txt.length;
|
cPopup.onkey(e);
|
||||||
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
|
});
|
||||||
$('#profile-jot-desc').html(ispublic);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$('#profile-jot-desc').html(' ');
|
ed.onKeyUp.add(function(ed, e) {
|
||||||
}
|
var txt = tinyMCE.activeEditor.getContent();
|
||||||
|
match = txt.match(/@([^ \n]+)$/);
|
||||||
|
if(match!==null) {
|
||||||
|
if(cPopup === null) {
|
||||||
|
cPopup = new ACPopup(this,baseurl+"/acl");
|
||||||
|
}
|
||||||
|
if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
|
||||||
|
if(! cPopup.ready) cPopup = null;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if(cPopup !== null) { cPopup.close(); cPopup = null; }
|
||||||
|
}
|
||||||
|
|
||||||
|
textlen = txt.length;
|
||||||
|
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
|
||||||
|
$('#profile-jot-desc').html(ispublic);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$('#profile-jot-desc').html(' ');
|
||||||
|
}
|
||||||
|
|
||||||
|
//Character count
|
||||||
|
|
||||||
if(textlen <= 140) {
|
if(textlen <= 140) {
|
||||||
$('#character-counter').removeClass('red');
|
$('#character-counter').removeClass('red');
|
||||||
|
@ -67,7 +88,6 @@ function initEditor(cb) {
|
||||||
$("#profile-upload-wrapper").show();
|
$("#profile-upload-wrapper").show();
|
||||||
$("#profile-attach-wrapper").show();
|
$("#profile-attach-wrapper").show();
|
||||||
$("#profile-link-wrapper").show();
|
$("#profile-link-wrapper").show();
|
||||||
$("#profile-youtube-wrapper").show();
|
|
||||||
$("#profile-video-wrapper").show();
|
$("#profile-video-wrapper").show();
|
||||||
$("#profile-audio-wrapper").show();
|
$("#profile-audio-wrapper").show();
|
||||||
$("#profile-location-wrapper").show();
|
$("#profile-location-wrapper").show();
|
||||||
|
@ -163,20 +183,13 @@ function initEditor(cb) {
|
||||||
if(reply && reply.length) {
|
if(reply && reply.length) {
|
||||||
reply = bin2hex(reply);
|
reply = bin2hex(reply);
|
||||||
$('#profile-rotator').show();
|
$('#profile-rotator').show();
|
||||||
$.get('parse_url?url=' + reply, function(data) {
|
$.get('parse_url?binurl=' + reply, function(data) {
|
||||||
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
||||||
$('#profile-rotator').hide();
|
$('#profile-rotator').hide();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function jotGetVideo() {
|
|
||||||
reply = prompt("$utubeurl");
|
|
||||||
if(reply && reply.length) {
|
|
||||||
tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function jotVideoURL() {
|
function jotVideoURL() {
|
||||||
reply = prompt("$vidurl");
|
reply = prompt("$vidurl");
|
||||||
if(reply && reply.length) {
|
if(reply && reply.length) {
|
||||||
|
@ -229,8 +242,9 @@ function initEditor(cb) {
|
||||||
event.target.textContent = reply;
|
event.target.textContent = reply;
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
if(reply && reply.length) {
|
if(reply && reply.length) {
|
||||||
|
reply = bin2hex(reply);
|
||||||
$('#profile-rotator').show();
|
$('#profile-rotator').show();
|
||||||
$.get('parse_url?url=' + reply, function(data) {
|
$.get('parse_url?binurl=' + reply, function(data) {
|
||||||
if (!editor) $("#profile-jot-text").val("");
|
if (!editor) $("#profile-jot-text").val("");
|
||||||
initEditor(function(){
|
initEditor(function(){
|
||||||
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
||||||
|
|
|
@ -30,9 +30,6 @@
|
||||||
<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
||||||
<a id="profile-link" class="icon border link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
|
<a id="profile-link" class="icon border link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
|
||||||
</div>
|
</div>
|
||||||
<div id="profile-youtube-wrapper" class="jot-tool" style="display: none;" >
|
|
||||||
<a id="profile-youtube" class="icon border youtube" title="$youtube" onclick="jotGetVideo(); return false;"></a>
|
|
||||||
</div>
|
|
||||||
<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
|
<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
|
||||||
<a id="profile-video" class="icon border video" title="$video" onclick="jotVideoURL(); return false;"></a>
|
<a id="profile-video" class="icon border video" title="$video" onclick="jotVideoURL(); return false;"></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,7 +1,3 @@
|
||||||
<h3>$messages</h3>
|
<h3>$messages</h3>
|
||||||
|
|
||||||
<ul class="tabs-wrapper">
|
$tab_content
|
||||||
<li><a href="message" class="tabs button {{if $activetab==inbox}}active{{endif}}">$inbox</a></li>
|
|
||||||
<li><a href="message/sent" class="tabs button {{if $activetab==sent}}active{{endif}}">$outbox</a></li>
|
|
||||||
<li><a href="message/new" class="tabs button {{if $activetab==new}}active{{endif}}">$new</a></li>
|
|
||||||
</ul>
|
|
||||||
|
|
Loading…
Reference in a new issue