Merge pull request #3072 from Hypolite/issue/#3062

Using placeholder attribute instead of hacky JS
This commit is contained in:
Michael Vogel 2017-01-28 07:32:18 +01:00 committed by GitHub
commit 05281a877b
34 changed files with 519 additions and 888 deletions

View file

@ -970,7 +970,6 @@ class App {
'$local_user' => local_user(),
'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
'$delitem' => t('Delete this item?'),
'$comment' => t('Comment'),
'$showmore' => t('show more'),
'$showfewer' => t('show fewer'),
'$update_interval' => $interval,

View file

@ -25,11 +25,17 @@
}
function openMenu(theID) {
document.getElementById(theID).style.display = "block"
var el = document.getElementById(theID)
if (el) {
el.style.display = "block";
}
}
function closeMenu(theID) {
document.getElementById(theID).style.display = "none"
var el = document.getElementById(theID)
if (el) {
el.style.display = "none";
}
}
function decodeHtml(html) {
@ -72,21 +78,19 @@
/* setup comment textarea buttons */
/* comment textarea buttons needs some "data-*" attributes to work:
* data-role="insert-formatting" : to mark the element as a formatting button
* data-comment="<string>" : string for "Comment", used by insertFormatting() function
* data-bbcode="<string>" : name of the bbcode element to insert. insertFormatting() will insert it as "[name][/name]"
* data-id="<string>" : id of the comment, used to find other comment-related element, like the textarea
* */
$('body').on('click','[data-role="insert-formatting"]', function(e) {
e.preventDefault();
var o = $(this);
var comment = o.data('comment');
var bbcode = o.data('bbcode');
var id = o.data('id');
if (bbcode=="img") {
Dialog.doImageBrowser("comment", id);
return;
}
insertFormatting(comment, bbcode, id);
insertFormatting(bbcode, id);
});
/* event from comment textarea button popups */

View file

@ -1589,7 +1589,6 @@ function photos_content(App $a) {
'$id' => $link_item['id'],
'$likethis' => t("I like this \x28toggle\x29"),
'$nolike' => (feature_enabled(local_user(), 'dislike') ? t("I don't like this \x28toggle\x29") : ''),
'$share' => t('Share'),
'$wait' => t('Please wait'),
'$return_path' => $a->query_string,
));

View file

@ -17,7 +17,7 @@
<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
</div>
<div class="comment-edit-photo-end"></div>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});"></textarea>
{{if $qcomment}}
<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
<option value=""></option>

View file

@ -55,14 +55,14 @@
For the relevant js part look at function loadContent() in main.js. *}}
{{if $infinite_scroll}}
var infinite_scroll = {
'pageno' : {{$infinite_scroll.pageno}},
'reload_uri' : "{{$infinite_scroll.reload_uri}}"
"pageno" : {{$infinite_scroll.pageno}},
"reload_uri" : "{{$infinite_scroll.reload_uri}}"
}
{{/if}}
function confirmDelete() { return confirm("{{$delitem}}"); }
function commentExpand(id) {
$("#comment-edit-text-" + id).value = '';
$("#comment-edit-text-" + id).value = "";
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
$("#comment-edit-text-" + id).focus();
@ -71,8 +71,7 @@
return true;
}
function commentOpen(obj,id) {
if(obj.value == '{{$comment}}') {
obj.value = '';
if (obj.value == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).show();
@ -82,8 +81,7 @@
return false;
}
function commentClose(obj,id) {
if(obj.value == '') {
obj.value = '{{$comment}}';
if (obj.value == "") {
$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).hide();
@ -96,46 +94,43 @@
function commentInsert(obj,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == '{{$comment}}') {
tmpStr = '';
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
var ins = $(obj).html();
ins = ins.replace('&lt;','<');
ins = ins.replace('&gt;','>');
ins = ins.replace('&amp;','&');
ins = ins.replace('&quot;','"');
ins = ins.replace("&lt;","<");
ins = ins.replace("&gt;",">");
ins = ins.replace("&amp;","&");
ins = ins.replace("&quot;","\"");
$("#comment-edit-text-" + id).val(tmpStr + ins);
}
function qCommentInsert(obj,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == '{{$comment}}') {
tmpStr = '';
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
var ins = $(obj).val();
ins = ins.replace('&lt;','<');
ins = ins.replace('&gt;','>');
ins = ins.replace('&amp;','&');
ins = ins.replace('&quot;','"');
ins = ins.replace("&lt;","<");
ins = ins.replace("&gt;",">");
ins = ins.replace("&amp;","&");
ins = ins.replace("&quot;","\"");
$("#comment-edit-text-" + id).val(tmpStr + ins);
$(obj).val('');
$(obj).val("");
}
window.showMore = "{{$showmore}}";
window.showFewer = "{{$showfewer}}";
function showHideCommentBox(id) {
if( $('#comment-edit-form-' + id).is(':visible')) {
$('#comment-edit-form-' + id).hide();
}
else {
$('#comment-edit-form-' + id).show();
if ($("#comment-edit-form-" + id).is(":visible")) {
$("#comment-edit-form-" + id).hide();
} else {
$("#comment-edit-form-" + id).show();
}
}

View file

@ -25,7 +25,7 @@
{{/if}}
<div id="jot-text-wrap">
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content}}{{/if}}</textarea>
</div>
<div id="profile-jot-submit-wrapper" class="jothidden">

View file

@ -20,7 +20,7 @@
<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl|escape:'html'}}" />
</div>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});"></textarea>
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">

View file

@ -20,31 +20,31 @@
<ul class="comment-edit-bb-{{$id}}">
<li><a class="editicon boldbb shadow"
style="cursor: pointer;" title="{{$edbold}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"></a></li>
<li><a class="editicon italicbb shadow"
style="cursor: pointer;" title="{{$editalic}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"></a></li>
<li><a class="editicon underlinebb shadow"
style="cursor: pointer;" title="{{$eduline}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"></a></li>
<li><a class="editicon quotebb shadow"
style="cursor: pointer;" title="{{$edquote}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"></a></li>
<li><a class="editicon codebb shadow"
style="cursor: pointer;" title="{{$edcode}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="code" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="code" data-id="{{$id}}"></a></li>
<li><a class="editicon imagebb shadow"
style="cursor: pointer;" title="{{$edimg}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}"></a></li>
<li><a class="editicon urlbb shadow"
style="cursor: pointer;" title="{{$edurl}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="url" data-id="{{$id}}"></a></li>
<li><a class="editicon videobb shadow"
style="cursor: pointer;" title="{{$edvideo}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="video" data-id="{{$id}}"></a></li>
</ul>
<div class="comment-edit-bb-end"></div>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});" >{{$comment}}</textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});"></textarea>
{{if $qcomment}}
<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
<option value=""></option>
@ -63,5 +63,4 @@
<div class="comment-edit-end"></div>
</form>
</div>

View file

@ -23,31 +23,31 @@
<ul class="comment-edit-bb-{{$id}}">
<li><a class="editicon boldbb shadow"
style="cursor: pointer;" title="{{$edbold}}"
onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
onclick="insertFormatting('b', {{$id}});"></a></li>
<li><a class="editicon italicbb shadow"
style="cursor: pointer;" title="{{$editalic}}"
onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
onclick="insertFormatting('i', {{$id}});"></a></li>
<li><a class="editicon underlinebb shadow"
style="cursor: pointer;" title="{{$eduline}}"
onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
onclick="insertFormatting('u', {{$id}});"></a></li>
<li><a class="editicon quotebb shadow"
style="cursor: pointer;" title="{{$edquote}}"
onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
onclick="insertFormatting('quote', {{$id}});"></a></li>
<li><a class="editicon codebb shadow"
style="cursor: pointer;" title="{{$edcode}}"
onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
onclick="insertFormatting('code', {{$id}});"></a></li>
<li><a class="editicon imagebb shadow"
style="cursor: pointer;" title="{{$edimg}}"
onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
onclick="insertFormatting('img', {{$id}});"></a></li>
<li><a class="editicon urlbb shadow"
style="cursor: pointer;" title="{{$edurl}}"
onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
onclick="insertFormatting('url', {{$id}});"></a></li>
<li><a class="editicon videobb shadow"
style="cursor: pointer;" title="{{$edvideo}}"
onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
onclick="insertFormatting('video', {{$id}});"></a></li>
</ul>
<div class="comment-edit-bb-end"></div>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});"></textarea>
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">

View file

@ -23,15 +23,12 @@ set_template_engine($a, 'smarty3');
}
$a->page['htmlhead'] .= <<< EOT
<script>
function insertFormatting(comment,BBcode,id) {
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
$("#comment-edit-text-" + id).val(tmpStr);
}
textarea = document.getElementById("comment-edit-text-" +id);
@ -40,16 +37,19 @@ function insertFormatting(comment,BBcode,id) {
selected = document.selection.createRange();
if (BBcode == "url") {
selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
} else
} else {
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
}
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
if (BBcode == "url") {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
} else
} else {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
}
return true;
}
@ -61,10 +61,6 @@ function cmtBbOpen(comment, id) {
return false;
}
function cmtBbClose(comment, id) {
// if($(comment).hasClass('comment-edit-text-empty')) {
// $(".comment-edit-bb-" + id).hide();
// return true;
// }
return false;
}
$(document).ready(function() {
@ -105,10 +101,7 @@ $('.savedsearchterm').hover(
id = $(this).attr('id');
$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
);
});
</script>
EOT;
}

View file

@ -121,8 +121,7 @@ var FileBrowser = {
// work as expected (we need a way to wait until commentOpenUI would be finished).
// As for now we insert pieces of this function here
if ((commentElm !== null) && (typeof commentElm !== "undefined")) {
if (commentElm.value == aStr.comment){
commentElm.value = "";
if (commentElm.value == "") {
$("#comment-edit-text-" + FileBrowser.id).addClass("comment-edit-text-full").removeClass("comment-edit-text-empty");
$("#comment-edit-submit-wrapper-" + FileBrowser.id).show();
$("#comment-edit-text-" + FileBrowser.id).attr('tabindex','9');
@ -142,11 +141,6 @@ var FileBrowser = {
$('#modal').modal('hide');
// update autosize for this textarea
autosize.update($(".text-autosize"));
// if (id!=="") {
// commentExpand(FileBrowser.id);
// //$("#comment-edit-text-558").empty();
// };
});
if ($("#upload-image").length)

View file

@ -3,15 +3,12 @@
*/
function insertFormatting(comment,BBcode,id) {
function insertFormatting(BBcode,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
if (tmpStr == '') {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
$("#comment-edit-text-" + id).val(tmpStr);
}
textarea = document.getElementById("comment-edit-text-" +id);
@ -20,16 +17,19 @@ function insertFormatting(comment,BBcode,id) {
selected = document.selection.createRange();
if (BBcode == "url") {
selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
} else
} else {
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
}
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
if (BBcode == "url") {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
} else
} else {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
}
return true;
}
@ -62,7 +62,6 @@ function commentExpand(id) {
function commentClose(obj,id) {
if (obj.value == '') {
obj.value = aStr.comment;
$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).hide();
@ -85,15 +84,14 @@ function commentOpenUI(obj, id) {
$(document).unbind( "click.commentOpen", handler );
var handler = function() {
if(obj.value == aStr.comment) {
obj.value = '';
if (obj.value == '') {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full").removeClass("comment-edit-text-empty");
// Choose an arbitrary tab index that's greater than what we're using in jot (3 of them)
// The submit button gets tabindex + 1
$("#comment-edit-text-" + id).attr('tabindex','9');
$("#comment-edit-submit-" + id).attr('tabindex','10');
$("#comment-edit-submit-wrapper-" + id).show();
// initiale autosize for this comment
// initialize autosize for this comment
autosize($("#comment-edit-text-" + id + ".text-autosize"));
}
};
@ -106,7 +104,6 @@ function commentCloseUI(obj, id) {
var handler = function() {
if (obj.value === '') {
obj.value = aStr.comment;
$("#comment-edit-text-" + id).removeClass("comment-edit-text-full").addClass("comment-edit-text-empty");
$("#comment-edit-text-" + id).removeAttr('tabindex');
$("#comment-edit-submit-" + id).removeAttr('tabindex');
@ -119,21 +116,16 @@ function commentCloseUI(obj, id) {
$(document).bind( "click.commentClose", handler );
}
// test if there is default content in the jot text box and remove it
function jotTextOpenUI(obj) {
if(obj.value == aStr.share) {
obj.value = '';
if (obj.value == '') {
$(".modal-body #profile-jot-text").addClass("profile-jot-text-full").removeClass("profile-jot-text-empty");
// initiale autosize for the jot
autosize($(".modal-body #profile-jot-text"));
}
}
// insert default content into the jot text box
// if it's empty
function jotTextCloseUI(obj) {
if (obj.value === '') {
obj.value = aStr.share;
$(".modal-body #profile-jot-text").removeClass("profile-jot-text-full").addClass("profile-jot-text-empty");
// destroy the automatic textarea resizing
autosize.destroy($(".modal-body #profile-jot-text"));
@ -141,8 +133,7 @@ function jotTextCloseUI(obj) {
}
function commentOpen(obj,id) {
if(obj.value == aStr.comment) {
obj.value = '';
if (obj.value == '') {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).show();
@ -154,8 +145,7 @@ function commentOpen(obj,id) {
function commentInsert(obj,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == aStr.comment) {
tmpStr = '';
if (tmpStr == '') {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
@ -170,8 +160,7 @@ function commentInsert(obj,id) {
function qCommentInsert(obj,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == aStr.comment) {
tmpStr = '';
if (tmpStr == '') {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);

View file

@ -13,12 +13,8 @@
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
<!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
</div>
<div class="comment-edit-photo-end"></div>-->
<div class="bb form-group">
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty form-control text-autosize" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});">{{$comment}}</textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});"></textarea>
</div>
{{if $qcomment}}
<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
@ -37,38 +33,38 @@
{{/if}}
<ul class="comment-edit-bb-{{$id}} comment-icon-list nav nav-pills pull-right">
<li>
<a class="icon" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}">
<a class="icon" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
<i class="fa fa-picture-o"></i>
</a>
</li>
<li>
<a class="icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('{{$comment}}','url',{{$id}});">
<a class="icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
<i class="fa fa-link"></i>
</a>
</li>
<li>
<a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('{{$comment}}','video',{{$id}});">
<a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('video',{{$id}});">
<i class="fa fa-video-camera"></i>
</a>
</li>
<li>
<a class="icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('{{$comment}}','u',{{$id}});">
<a class="icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
<i class="fa fa-underline"></i>
</a>
</li>
<li>
<a class="icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('{{$comment}}','i',{{$id}});">
<a class="icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
<i class="fa fa-italic"></i>
</a>
</li>
<li>
<a class="icon bold" style="cursor: pointer;" title="{{$edbold}}" onclick="insertFormatting('{{$comment}}','b',{{$id}});">
<a class="icon bold" style="cursor: pointer;" title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
<i class="fa fa-bold"></i>
</a>
</li>
<li>
<a class="icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('{{$comment}}','quote',{{$id}});">
<a class="icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
<i class="fa fa-quote-left"></i>
</a>
</li>

View file

@ -62,7 +62,7 @@
{{* The jot text field in which the post text is inserted *}}
<div id="jot-text-wrap">
<textarea rows="2" cols="64" class="profile-jot-text form-control text-autosize" id="profile-jot-text" name="body" onFocus="jotTextOpenUI(this);" onBlur="jotTextCloseUI(this);" style="min-width:100%; max-width:100%;">{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
<textarea rows="2" cols="64" class="profile-jot-text form-control text-autosize" id="profile-jot-text" name="body" placeholder="{{$share}}" onFocus="jotTextOpenUI(this);" onBlur="jotTextCloseUI(this);" style="min-width:100%; max-width:100%;">{{if $content}}{{$content}}{{/if}}</textarea>
</div>
<ul id="profile-jot-submit-wrapper" class="jothidden nav nav-pills">
@ -123,9 +123,5 @@ can load different content into the jot moadl (e.g. the item edit jot)
$('iframe').load(function() {
this.style.height = this.contentWindow.document.body.offsetHeight + 'px';
});
// insert new object with value to aStr
// function jotTextOpenUI does make use of it
aStr.share = "{{$share}}";
</script>

View file

@ -8,7 +8,6 @@ They are loaded into the html <head> so that js functions can use them *}}
var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
var aStr = {
'delitem' : "{{$delitem}}",
'comment' : "{{$comment}}"
};
{{* Create an object with the data which is needed for infinite scroll.

View file

@ -5,7 +5,6 @@ $(document).ready(function() {
$("#profile-jot-text").click(enableOnUser);
$('#event-share-checkbox').change(function() {
if ($('#event-share-checkbox').is(':checked')) {
$('#acl-wrapper').show();
}
@ -14,7 +13,6 @@ $(document).ready(function() {
}
}).trigger('change');
$(".popupbox").click(function () {
var parent = $( $(this).attr('href') ).parent();
if (parent.css('display') == 'none') {
@ -91,15 +89,6 @@ $(document).ready(function() {
break;
}
/* if(window.autoCompleteType == "display-head") {
//$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
// make auto-complete work in more places
//$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
$(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
}*/
if (window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
@ -227,12 +216,6 @@ function initCrop() {
function showEvent(eventid) {
/* $.get(
baseurl + window.eventModuleUrl + '/?id=' + eventid,
function(data){
$.colorbox({html:data});
}
);*/
}
/*
@ -329,29 +312,6 @@ function jotGetLink() {
}
}
/*function linkdropper(event) {
var linkFound = event.dataTransfer.types.contains("text/uri-list");
if(linkFound)
event.preventDefault();
}
function linkdrop(event) {
var reply = event.dataTransfer.getData("text/uri-list");
event.target.textContent = reply;
event.preventDefault();
if(reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show();
$.get('parse_url?binurl=' + reply, function(data) {
//if (!editor) $("#profile-jot-text").val("");
//initEditor(function(){
addeditortext(window.jotId, data);
$('#profile-rotator').hide();
//});
});
}
}*/
function jotClearLocation() {
$('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide();
@ -367,24 +327,6 @@ if(typeof window.geoTag === 'function') window.geoTag();
function confirmDelete() { return confirm(window.delItem); }
/*function deleteCheckedItems() {
var checkedstr = '';
$('.item-select').each( function() {
if($(this).is(':checked')) {
if(checkedstr.length != 0) {
checkedstr = checkedstr + ',' + $(this).val();
}
else {
checkedstr = $(this).val();
}
}
});
$.post('item', { dropitems: checkedstr }, function(data) {
window.location.reload();
});
}*/
function itemTag(id) {
reply = prompt(window.term);
if (reply && reply.length) {
@ -403,7 +345,6 @@ function itemTag(id) {
}
function itemFiler(id) {
$.get('filer/', function(data) {
var promptText = $('#id_term_label', data).text();
@ -413,54 +354,16 @@ function itemFiler(id) {
commentBusy = true;
$('body').css('cursor', 'wait');
$.get('filer/' + id + '?term=' + reply, NavUpdate);
/* if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/
liking = 1;
/* $.colorbox.close();*/
}
});
/* var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){
$.colorbox({html:data});
$("#id_term").keypress(function(){
$(this).css("border-color",bordercolor);
})
$("#select_term").change(function(){
$("#id_term").css("border-color",bordercolor);
})
$("#filer_save").click(function(e){
e.preventDefault();
reply = $("#id_term").val();
if(reply && reply.length) {
commentBusy = true;
$('body').css('cursor', 'wait');
$.get('filer/' + id + '?term=' + reply);
if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);
liking = 1;
$.colorbox.close();
} else {
$("#id_term").css("border-color","#FF0000");
}
return false;
});
});
*/
}
/*
* Comments
*/
function commentOpen(obj,id) {
if(obj.value == window.commentEmptyText) {
obj.value = "";
if (obj.value == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).show();
@ -469,7 +372,6 @@ function commentOpen(obj,id) {
}
function commentClose(obj,id) {
if (obj.value == "") {
obj.value = window.commentEmptyText;
$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).hide();
@ -480,8 +382,7 @@ function commentClose(obj,id) {
function commentInsert(obj,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == window.commentEmptyText) {
tmpStr = "";
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
@ -496,8 +397,7 @@ function commentInsert(obj,id) {
function qCommentInsert(obj,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == window.commentEmptyText) {
tmpStr = "";
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
@ -511,25 +411,12 @@ function qCommentInsert(obj,id) {
$(obj).val("");
}
/*function showHideCommentBox(id) {
if( $('#comment-edit-form-' + id).is(':visible')) {
$('#comment-edit-form-' + id).hide();
}
else {
$('#comment-edit-form-' + id).show();
}
}*/
function insertFormatting(comment,BBcode,id) {
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
$("#comment-edit-text-" + id).val(tmpStr);
}
textarea = document.getElementById("comment-edit-text-" +id);
@ -538,16 +425,19 @@ function insertFormatting(comment,BBcode,id) {
selected = document.selection.createRange();
if (BBcode == "url") {
selected.text = "["+BBcode+"=http://]" + selected.text + "[/"+BBcode+"]";
} else
} else {
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
}
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
if (BBcode == "url") {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"=http://]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
} else
} else {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
}
return true;
}
@ -557,5 +447,3 @@ function cmtBbOpen(id) {
function cmtBbClose(id) {
$(".comment-edit-bb-" + id).hide();
}

View file

@ -1,62 +1,32 @@
{{*<!-- <script>
$(document).ready( function () {
$(document).mouseup(function(e) {
var container = $("#comment-edit-wrapper-{{$id}}");
if( container.has(e.target).length === 0) {
commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
cmtBbClose({{$id}});
}
});
});
</script>-->*}}
<div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;">
<form class="comment-edit-form {{$indent}}" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
{{*<!-- <span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
<input type="hidden" name="type" value="{{$type}}" />
<input type="hidden" name="source" value="{{$sourceapp}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="parent" value="{{$parent}}" />
{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
<input type="hidden" name="jsreload" value="{{$jsreload}}" />
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
{{*<!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
{{*<!--</div>-->*}}
{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
<ul class="comment-edit-bb-{{$id}}">
<li><a class="editicon boldbb shadow"
style="cursor: pointer;" title="{{$edbold}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"></a></li>
<li><a class="editicon italicbb shadow"
style="cursor: pointer;" title="{{$editalic}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"></a></li>
<li><a class="editicon underlinebb shadow"
style="cursor: pointer;" title="{{$eduline}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"></a></li>
<li><a class="editicon quotebb shadow"
style="cursor: pointer;" title="{{$edquote}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"></a></li>
<li><a class="editicon codebb shadow"
style="cursor: pointer;" title="{{$edcode}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="code" data-id="{{$id}}"></a></li>
{{*<!-- <li><a class="editicon imagebb shadow"
style="cursor: pointer;" title="{{$edimg}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"></a></li>
<li><a class="editicon urlbb shadow"
style="cursor: pointer;" title="{{$edurl}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="{{$id}}"></a></li>
<li><a class="editicon videobb shadow"
style="cursor: pointer;" title="{{$edvideo}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"></a></li>-->*}}
data-role="insert-formatting" data-bbcode="code" data-id="{{$id}}"></a></li>
</ul>
{{*<!--<div class="comment-edit-bb-end"></div>-->*}}
{{*<!-- <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});"></textarea>
{{if $qcomment}}
<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
<option value=""></option>
@ -69,11 +39,6 @@
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
{{*<!--<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="preview-link fakelink">{{$preview}}</span>
<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>-->*}}
</div>
{{*<!--<div class="comment-edit-end"></div>-->*}}
</form>
</div>

View file

@ -17,7 +17,6 @@
<script>
window.delItem = "{{$delitem}}";
window.commentEmptyText = "{{$comment}}";
window.showMore = "{{$showmore}}";
window.showFewer = "{{$showfewer}}";
var updateInterval = {{$update_interval}};

View file

@ -26,7 +26,7 @@
{{/if}}
<div id="jot-text-wrap">
{{*<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />-->*}}
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content}}{{/if}}</textarea>
</div>
<div id="profile-jot-submit-wrapper" class="jothidden">

View file

@ -23,31 +23,31 @@
<ul class="comment-edit-bb-{{$id}}">
<li><a class="editicon boldbb shadow"
style="cursor: pointer;" title="{{$edbold}}"
onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
onclick="insertFormatting('b', {{$id}});"></a></li>
<li><a class="editicon italicbb shadow"
style="cursor: pointer;" title="{{$editalic}}"
onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
onclick="insertFormatting('i', {{$id}});"></a></li>
<li><a class="editicon underlinebb shadow"
style="cursor: pointer;" title="{{$eduline}}"
onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
onclick="insertFormatting('u', {{$id}});"></a></li>
<li><a class="editicon quotebb shadow"
style="cursor: pointer;" title="{{$edquote}}"
onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
onclick="insertFormatting('quote', {{$id}});"></a></li>
<li><a class="editicon codebb shadow"
style="cursor: pointer;" title="{{$edcode}}"
onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
onclick="insertFormatting('code', {{$id}});"></a></li>
<li><a class="editicon imagebb shadow"
style="cursor: pointer;" title="{{$edimg}}"
onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
onclick="insertFormatting('img', {{$id}});"></a></li>
<li><a class="editicon urlbb shadow"
style="cursor: pointer;" title="{{$edurl}}"
onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
onclick="insertFormatting('url', {{$id}});"></a></li>
<li><a class="editicon videobb shadow"
style="cursor: pointer;" title="{{$edvideo}}"
onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
onclick="insertFormatting('video', {{$id}});"></a></li>
</ul>
<div class="comment-edit-bb-end"></div>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});"></textarea>
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">

View file

@ -12,11 +12,6 @@ $(document).ready(function() {
'#system-menu-list-closing': false
};
/* $.ajaxSetup({
cache: false
});*/
/* enable editor on focus and click */
$("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser);
@ -27,8 +22,6 @@ $(document).ready(function() {
hideNavMenu($(this).attr('point'));
});
/* $('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
$('.group-edit-icon').hover(
function() {
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
@ -64,36 +57,15 @@ $(document).ready(function() {
$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
);
/* $('.nav-load-page-link').click(function() {
getPageContent( $(this).attr('href') );
hideNavMenu( '#' + $(this).closest('ul').attr('id') );
return false;
});*/
$('#id_share').change(function() {
if ($('#id_share').is(':checked')) {
$('#acl-wrapper').show();
}
else {
} else {
$('#acl-wrapper').hide();
}
}).trigger('change');
// For event_end.tpl
/* $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
$('#jot-public').hide();
});
if(selstr == null) {
$('#jot-public').show();
}
}).trigger('change');*/
if (typeof window.AjaxUpload != "undefined") {
var uploader = new window.AjaxUpload(
window.imageUploadButton,
@ -242,13 +214,6 @@ $(document).ready(function() {
break;
}
/* if(window.autoCompleteType == "display-head") {
//$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
// make auto-complete work in more places
//$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
$(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
}*/
// Add Colorbox for viewing Network page images
//var cBoxClasses = new Array();
$(".wall-item-body a img").each(function() {
@ -265,10 +230,6 @@ $(document).ready(function() {
var cBoxClass = $(this).closest(".wall-item-body").attr("id") + "-lightbox";
$(this).addClass(cBoxClass);
// if( $.inArray(cBoxClass, cBoxClasses) < 0 ) {
// cBoxClasses.push(cBoxClass);
// }
aElem.colorbox({
maxHeight: '90%',
photo: true, // Colorbox doesn't recognize a URL that don't end in .jpg, etc. as a photo
@ -276,14 +237,6 @@ $(document).ready(function() {
});
}
});
/*$.each(cBoxClasses, function(){
$('.'+this).colorbox({
maxHeight: '90%',
photo: true,
rel: this
});
});*/
});
@ -320,7 +273,9 @@ $(function(){
console.log(":)", url, data);
$.post(url, data, function(data) {
if(timer) clearTimeout(timer);
if (timer) {
clearTimeout(timer);
}
NavUpdate();
$.colorbox.close();
})
@ -396,58 +351,12 @@ function initCrop() {
});
}
/*
$(document).mouseup(function (clickPos) {
var sysMenu = $("#system-menu-list");
var sysMenuLink = $(".system-menu-link");
var contactsMenu = $("#contacts-menu-list");
var contactsMenuLink = $(".contacts-menu-link");
var networkMenu = $("#network-menu-list");
var networkMenuLink = $(".network-menu-link");
if( !sysMenu.is(clickPos.target) && !sysMenuLink.is(clickPos.target) && sysMenu.has(clickPos.target).length === 0) {
hideNavMenu("#system-menu-list");
}
if( !contactsMenu.is(clickPos.target) && !contactsMenuLink.is(clickPos.target) && contactsMenu.has(clickPos.target).length === 0) {
hideNavMenu("#contacts-menu-list");
}
if( !networkMenu.is(clickPos.target) && !networkMenuLink.is(clickPos.target) && networkMenu.has(clickPos.target).length === 0) {
hideNavMenu("#network-menu-list");
}
});
function getPageContent(url) {
var pos = $('.main-container').position();
$('.main-container').css('margin-left', pos.left);
$('.main-content-container').hide(0, function () {
$('.main-content-loading').show(0);
});
$.get(url, function(html) {
console.log($('.main-content-container').html());
$('.main-content-container').html( $('.main-content-container', html).html() );
console.log($('.main-content-container').html());
$('.main-content-loading').hide(function() {
$('.main-content-container').fadeIn(800,function() {
$('.main-container').css('margin-left', 'auto'); // This sucks -- if the CSS specification changes, this will be wrong
});
});
});
}
*/
function showNavMenu(menuID) {
if (window.navMenuTimeout[menuID + '-closing']) {
window.navMenuTimeout[menuID + '-closing'] = false;
clearTimeout(window.navMenuTimeout[menuID + '-timeout']);
}
else {
} else {
window.navMenuTimeout[menuID + '-opening'] = true;
window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () {
@ -462,8 +371,7 @@ function hideNavMenu(menuID) {
if (window.navMenuTimeout[menuID + '-opening']) {
window.navMenuTimeout[menuID + '-opening'] = false;
clearTimeout(window.navMenuTimeout[menuID + '-timeout']);
}
else {
} else {
window.navMenuTimeout[menuID + '-closing'] = true;
window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () {
@ -540,37 +448,6 @@ function jotAudioURL() {
function jotGetLocation() {
/* if(navigator.geolocation) {
navigator.geolocation.getCurrentPosition(function(position) {
var lat = position.coords.latitude;
var lng = position.coords.longitude;
$.ajax({
type: 'GET',
url: 'http://nominatim.openstreetmap.org/reverse?format=json&lat='+lat+'&lon='+lng,
jsonp: 'json_callback',
contentType: 'application/json',
dataType: 'jsonp',
success: function(json) {
console.log(json);
var locationDisplay = json.address.building+', '+json.address.city+', '+json.address.state;
$('#jot-location').val(locationDisplay);
$('#jot-display-location').html('Location: '+locationDisplay);
$('#jot-display-location').show();
}
});
});
}
else {
reply = prompt(window.whereAreU, $('#jot-location').val());
if(reply && reply.length) {
$('#jot-location').val(reply);
}
}*/
reply = prompt(window.whereAreU, $('#jot-location').val());
if (reply && reply.length) {
$('#jot-location').val(reply);
@ -620,25 +497,15 @@ function linkdropper(event) {
function linkdrop(event) {
var reply = event.dataTransfer.getData("text/uri-list");
//event.target.textContent = reply;
event.preventDefault();
if (reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show();
$.get('parse_url?binurl=' + reply, function(data) {
/* if(window.jotId == "#profile-jot-text") {
if (!editor) $("#profile-jot-text").val("");
initEditor(function(){
addeditortext(window.jotId, data);
$('#profile-rotator').hide();
});
}
else {*/
addeditortext(window.jotId, data);
$('#profile-rotator').hide();
// }
});
}
}
@ -661,8 +528,7 @@ function deleteCheckedItems(delID) {
if ($(this).is(':checked')) {
if (checkedstr.length != 0) {
checkedstr = checkedstr + ',' + $(this).val();
}
else {
} else {
checkedstr = $(this).val();
}
}
@ -683,8 +549,6 @@ function itemTag(id) {
$('body').css('cursor', 'wait');
$.get('tagger/' + id + '?term=' + reply, NavUpdate);
/*if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/
liking = 1;
}
}
@ -711,8 +575,6 @@ function itemFiler(id) {
commentBusy = true;
$('body').css('cursor', 'wait');
$.get('filer/' + id + '?term=' + reply, NavUpdate);
/* if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/
liking = 1;
$.colorbox.close();
} else {
@ -729,15 +591,12 @@ function itemFiler(id) {
* Comments
*/
function insertFormatting(comment,BBcode,id) {
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
$("#comment-edit-text-" + id).val(tmpStr);
}
textarea = document.getElementById("comment-edit-text-" +id);
@ -746,16 +605,19 @@ function insertFormatting(comment,BBcode,id) {
selected = document.selection.createRange();
if (BBcode == "url") {
selected.text = "["+BBcode+"=http://]" + selected.text + "[/"+BBcode+"]";
} else
} else {
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
}
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
if (BBcode == "url") {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"=http://]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
} else
} else {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
}
return true;
}
@ -767,8 +629,7 @@ function cmtBbClose(id) {
}
function commentOpen(obj,id) {
if(obj.value == window.commentEmptyText) {
obj.value = "";
if (obj.value == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).show();
@ -777,7 +638,6 @@ function commentOpen(obj,id) {
}
function commentClose(obj,id) {
if (obj.value == "") {
obj.value = window.commentEmptyText;
$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).hide();
@ -788,8 +648,7 @@ function commentClose(obj,id) {
function commentInsert(obj,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == window.commentEmptyText) {
tmpStr = "";
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
@ -804,8 +663,7 @@ function commentInsert(obj,id) {
function qCommentInsert(obj,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == window.commentEmptyText) {
tmpStr = "";
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
@ -818,13 +676,3 @@ function qCommentInsert(obj,id) {
$("#comment-edit-text-" + id).val(tmpStr + ins);
$(obj).val("");
}
/*function showHideCommentBox(id) {
if( $('#comment-edit-form-' + id).is(':visible')) {
$('#comment-edit-form-' + id).hide();
}
else {
$('#comment-edit-form-' + id).show();
}
}*/

View file

@ -1,20 +1,5 @@
{{*<!-- <script>
$(document).ready( function () {
$(document).mouseup(function(e) {
var container = $("#comment-edit-wrapper-{{$id}}");
if( container.has(e.target).length === 0) {
commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
cmtBbClose({{$id}});
}
});
});
</script>-->*}}
<div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;">
<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
{{*<!-- <span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
<input type="hidden" name="type" value="{{$type}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="parent" value="{{$parent}}" />
@ -23,39 +8,34 @@
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
{{*<!-- <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
{{*<!-- </div>-->*}}
{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
<ul class="comment-edit-bb" id="comment-edit-bb-{{$id}}">
<li><a class="editicon boldbb shadow"
style="cursor: pointer;" title="{{$edbold}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"></a></li>
<li><a class="editicon italicbb shadow"
style="cursor: pointer;" title="{{$editalic}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"></a></li>
<li><a class="editicon underlinebb shadow"
style="cursor: pointer;" title="{{$eduline}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"></a></li>
<li><a class="editicon quotebb shadow"
style="cursor: pointer;" title="{{$edquote}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"></a></li>
<li><a class="editicon codebb shadow"
style="cursor: pointer;" title="{{$edcode}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="code" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="code" data-id="{{$id}}"></a></li>
<li><a class="editicon imagebb shadow"
style="cursor: pointer;" title="{{$edimg}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}"></a></li>
<li><a class="editicon urlbb shadow"
style="cursor: pointer;" title="{{$edurl}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="url" data-id="{{$id}}"></a></li>
<li><a class="editicon videobb shadow"
style="cursor: pointer;" title="{{$edvideo}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="video" data-id="{{$id}}"></a></li>
</ul>
{{*<!-- <div class="comment-edit-bb-end"></div>-->*}}
{{*<!-- <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});"></textarea>
{{if $qcomment}}
<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
<option value=""></option>
@ -71,8 +51,5 @@
<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
</div>
{{*<!--<div class="comment-edit-end"></div>-->*}}
</form>
</div>

View file

@ -19,7 +19,6 @@
<script>
window.delItem = "{{$delitem}}";
window.commentEmptyText = "{{$comment}}";
window.showMore = "{{$showmore}}";
window.showFewer = "{{$showfewer}}";
var updateInterval = {{$update_interval}};

View file

@ -25,7 +25,7 @@
{{/if}}
<div id="jot-text-wrap">
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content}}{{/if}}</textarea>
</div>
<div id="profile-jot-submit-wrapper" class="jothidden">

View file

@ -23,31 +23,31 @@
<ul class="comment-edit-bb-{{$id}}">
<li><a class="editicon boldbb shadow"
style="cursor: pointer;" title="{{$edbold}}"
onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
onclick="insertFormatting('b', {{$id}});"></a></li>
<li><a class="editicon italicbb shadow"
style="cursor: pointer;" title="{{$editalic}}"
onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
onclick="insertFormatting('i', {{$id}});"></a></li>
<li><a class="editicon underlinebb shadow"
style="cursor: pointer;" title="{{$eduline}}"
onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
onclick="insertFormatting('u', {{$id}});"></a></li>
<li><a class="editicon quotebb shadow"
style="cursor: pointer;" title="{{$edquote}}"
onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
onclick="insertFormatting('quote', {{$id}});"></a></li>
<li><a class="editicon codebb shadow"
style="cursor: pointer;" title="{{$edcode}}"
onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
onclick="insertFormatting('code', {{$id}});"></a></li>
<li><a class="editicon imagebb shadow"
style="cursor: pointer;" title="{{$edimg}}"
onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
onclick="insertFormatting('img', {{$id}});"></a></li>
<li><a class="editicon urlbb shadow"
style="cursor: pointer;" title="{{$edurl}}"
onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
onclick="insertFormatting('url', {{$id}});"></a></li>
<li><a class="editicon videobb shadow"
style="cursor: pointer;" title="{{$edvideo}}"
onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
onclick="insertFormatting('video', {{$id}});"></a></li>
</ul>
<div class="comment-edit-bb-end"></div>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});"></textarea>
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">

View file

@ -59,15 +59,12 @@ $(document).ready(function(){
});
});
function insertFormatting(comment,BBcode,id) {
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
$("#comment-edit-text-" + id).val(tmpStr);
}
textarea = document.getElementById("comment-edit-text-" +id);
@ -76,16 +73,19 @@ function insertFormatting(comment,BBcode,id) {
selected = document.selection.createRange();
if (BBcode == "url") {
selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
} else
} else {
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
}
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
if (BBcode == "url") {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
} else
} else {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
}
return true;
}

View file

@ -15,33 +15,34 @@
class="comment-edit-bb">
<li><a class="editicon boldbb shadow"
style="cursor: pointer;" title="{{$edbold}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"></a></li>
<li><a class="editicon italicbb shadow"
style="cursor: pointer;" title="{{$editalic}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"></a></li>
<li><a class="editicon underlinebb shadow"
style="cursor: pointer;" title="{{$eduline}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"></a></li>
<li><a class="editicon quotebb shadow"
style="cursor: pointer;" title="{{$edquote}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"></a></li>
<li><a class="editicon codebb shadow"
style="cursor: pointer;" title="{{$edcode}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="code" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="code" data-id="{{$id}}"></a></li>
<li><a class="editicon imagebb shadow"
style="cursor: pointer;" title="{{$edimg}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}"></a></li>
<li><a class="editicon urlbb shadow"
style="cursor: pointer;" title="{{$edurl}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="url" data-id="{{$id}}"></a></li>
<li><a class="editicon videobb shadow"
style="cursor: pointer;" title="{{$edvideo}}"
data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"></a></li>
data-role="insert-formatting" data-bbcode="video" data-id="{{$id}}"></a></li>
</ul>
<textarea id="comment-edit-text-{{$id}}"
class="comment-edit-text-empty"
name="body"
onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});" >{{$comment}}</textarea>
placeholder="{{$comment}}"
onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});"></textarea>
{{if $qcomment}}
<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
<option value=""></option>

View file

@ -21,7 +21,7 @@
<input type="hidden" name="contact_allow[]" value="<{{$notes_cid}}>" />
{{/if}}
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content}}{{/if}}</textarea>
<ul id="jot-tools" class="jothidden" style="display:none">
<li><a href="#" onclick="return false;" id="wall-image-upload" title="{{$upload}}">{{$shortupload}}</a></a></li>

View file

@ -8,14 +8,14 @@ function tautogrow(id) {
$("textarea#comment-edit-text-" + id).autogrow();
};
function insertFormatting(comment, BBcode, id) {
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
textarea = document.getElementById("comment-edit-text-" + id);
if (document.selection) {
textarea.focus();
@ -38,6 +38,7 @@ textarea.value = textarea.value.substring(0, start)
+ textarea.value.substring(end, textarea.value.length);
}
}
return true;
}
@ -47,7 +48,4 @@ $(".comment-edit-bb-" + id).show();
function cmtBbClose(id) {
$(".comment-edit-bb-" + id).hide();
}
</script>

View file

@ -26,9 +26,8 @@
{{/if}}
<div id="jot-text-wrap">
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /><br>
<textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" >
{{if $content}}{{$content}}{{else}}{{$share}}
{{/if}}
<textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">
{{if $content}}{{$content}}{{/if}}
</textarea>
</div>

View file

@ -19,15 +19,12 @@ function smoothly_init(App $a) {
$a->page['htmlhead'] .= <<< EOT
<script>
function insertFormatting(comment,BBcode,id) {
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
$("#comment-edit-text-" + id).val(tmpStr);
}
textarea = document.getElementById("comment-edit-text-" +id);
@ -36,16 +33,19 @@ function insertFormatting(comment,BBcode,id) {
selected = document.selection.createRange();
if (BBcode == "url") {
selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
} else
} else {
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
}
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
if (BBcode == "url") {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
} else
} else {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
}
return true;
}

View file

@ -17,7 +17,7 @@
<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
</div>
<div class="comment-edit-photo-end"></div>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});">{{$comment}}</textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});"></textarea>
{{if $qcomment}}
<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
<option value=""></option>
@ -31,14 +31,14 @@
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
<div class="comment-edit-bb">
<a title="{{$edimg}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"><i class="icon-picture"></i></a>
<a title="{{$edurl}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="{{$id}}"><i class="icon-link"></i></a>
<a title="{{$edvideo}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"><i class="icon-film"></i></a>
<a title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}"><i class="icon-picture"></i></a>
<a title="{{$edurl}}" data-role="insert-formatting" data-bbcode="url" data-id="{{$id}}"><i class="icon-link"></i></a>
<a title="{{$edvideo}}" data-role="insert-formatting" data-bbcode="video" data-id="{{$id}}"><i class="icon-film"></i></a>
<a title="{{$eduline}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"><i class="icon-underline"></i></a>
<a title="{{$editalic}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"><i class="icon-italic"></i></a>
<a title="{{$edbold}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"><i class="icon-bold"></i></a>
<a title="{{$edquote}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"><i class="icon-quote-left"></i></a>
<a title="{{$eduline}}" data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"><i class="icon-underline"></i></a>
<a title="{{$editalic}}" data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"><i class="icon-italic"></i></a>
<a title="{{$edbold}}" data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"><i class="icon-bold"></i></a>
<a title="{{$edquote}}" data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"><i class="icon-quote-left"></i></a>
</div>
<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />

View file

@ -27,27 +27,27 @@
<div id="event-desc-text">{{$d_text}}</div>
<textarea id="comment-edit-text-desc" rows="8" cols="64" name="desc" autocomplete="off">{{$d_orig}}</textarea>
<div id="event-desc-text-edit-bb" class="comment-edit-bb">
<a title="{{$edimg}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="desc"><i class="icon-picture"></i></a>
<a title="{{$edurl}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="desc"><i class="icon-link"></i></a>
<a title="{{$edvideo}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="desc"><i class="icon-film"></i></a>
<a title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="desc"><i class="icon-picture"></i></a>
<a title="{{$edurl}}" data-role="insert-formatting" data-bbcode="url" data-id="desc"><i class="icon-link"></i></a>
<a title="{{$edvideo}}" data-role="insert-formatting" data-bbcode="video" data-id="desc"><i class="icon-film"></i></a>
<a title="{{$eduline}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="desc"><i class="icon-underline"></i></a>
<a title="{{$editalic}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="desc"><i class="icon-italic"></i></a>
<a title="{{$edbold}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="desc"><i class="icon-bold"></i></a>
<a title="{{$edquote}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="desc"><i class="icon-quote-left"></i></a>
<a title="{{$eduline}}" data-role="insert-formatting" data-bbcode="u" data-id="desc"><i class="icon-underline"></i></a>
<a title="{{$editalic}}" data-role="insert-formatting" data-bbcode="i" data-id="desc"><i class="icon-italic"></i></a>
<a title="{{$edbold}}" data-role="insert-formatting" data-bbcode="b" data-id="desc"><i class="icon-bold"></i></a>
<a title="{{$edquote}}" data-role="insert-formatting" data-bbcode="quote" data-id="desc"><i class="icon-quote-left"></i></a>
</div>
<div id="event-location-text">{{$l_text}}</div>
<textarea id="comment-edit-text-location" rows="4" cols="64" name="location">{{$l_orig}}</textarea>
<div id="event-location-text-edit-bb" class="comment-edit-bb">
<a title="{{$edimg}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="location"><i class="icon-picture"></i></a>
<a title="{{$edurl}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="location"><i class="icon-link"></i></a>
<a title="{{$edvideo}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="location"><i class="icon-film"></i></a>
<a title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="location"><i class="icon-picture"></i></a>
<a title="{{$edurl}}" data-role="insert-formatting" data-bbcode="url" data-id="location"><i class="icon-link"></i></a>
<a title="{{$edvideo}}" data-role="insert-formatting" data-bbcode="video" data-id="location"><i class="icon-film"></i></a>
<a title="{{$eduline}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="location"><i class="icon-underline"></i></a>
<a title="{{$editalic}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="location"><i class="icon-italic"></i></a>
<a title="{{$edbold}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="location"><i class="icon-bold"></i></a>
<a title="{{$edquote}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="location"><i class="icon-quote-left"></i></a>
<a title="{{$eduline}}" data-role="insert-formatting" data-bbcode="u" data-id="location"><i class="icon-underline"></i></a>
<a title="{{$editalic}}" data-role="insert-formatting" data-bbcode="i" data-id="location"><i class="icon-italic"></i></a>
<a title="{{$edbold}}" data-role="insert-formatting" data-bbcode="b" data-id="location"><i class="icon-bold"></i></a>
<a title="{{$edquote}}" data-role="insert-formatting" data-bbcode="quote" data-id="location"><i class="icon-quote-left"></i></a>
</div>
<div id="event-location-break"></div>

View file

@ -29,22 +29,19 @@ function vier_init(App $a) {
$a->page['htmlhead'] .= '<meta name=viewport content="width=device-width, initial-scale=1">'."\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen"/>'."\n";
}
// deactivated since it doesn't work with desktop browsers at the moment (To-Do)
/// @todo deactivated since it doesn't work with desktop browsers at the moment
//$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen and (max-width: 1000px)"/>'."\n";
$a->page['htmlhead'] .= <<< EOT
<link rel='stylesheet' type='text/css' href='view/theme/vier/narrow.css' media='screen and (max-width: 1100px)' />
<script type="text/javascript">
function insertFormatting(comment,BBcode,id) {
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
$("#comment-edit-text-" + id).val(tmpStr);
}
textarea = document.getElementById("comment-edit-text-" +id);
@ -53,19 +50,21 @@ function insertFormatting(comment,BBcode,id) {
selected = document.selection.createRange();
if (BBcode == "url") {
selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
} else
} else {
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
}
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
if (BBcode == "url") {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
} else
} else {
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
return true;
}
return true;
}
function showThread(id) {
$("#collapsed-comments-" + id).show()
@ -76,20 +75,15 @@ function hideThread(id) {
$("#collapsed-comments-" + id + " .collapsed-comments").hide()
}
function cmtBbOpen(id) {
$("#comment-edit-bb-" + id).show();
}
function cmtBbClose(id) {
$("#comment-edit-bb-" + id).hide();
}
</script>
EOT;
if ($a->is_mobile || $a->is_tablet){
$a->page['htmlhead'] .= <<< EOT
<script>
@ -106,12 +100,12 @@ if ($a->is_mobile || $a->is_tablet){
EOT;
}
// Hide the left menu bar
if (($a->page['aside'] == "") AND in_array($a->argv[0], array("community", "events", "help", "manage", "notifications",
"probe", "webfinger", "login", "invite", "credits")))
"probe", "webfinger", "login", "invite", "credits"))) {
$a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
}
}
function get_vier_config($key, $default = false, $admin = false) {
if (local_user() AND !$admin) {