Cleaning up, actual changes are in the next commits
- Formatting - Trailing spaces - Extraneous blank lines - Large comments
This commit is contained in:
Hypolite Petovan
parent
8d195dc499
commit
daa8e4f901
|
|
@ -1583,7 +1583,6 @@ function photos_content(&$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,
|
||||
));
|
||||
|
|
|
|||
|
|
@ -56,14 +56,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();
|
||||
|
|
@ -104,10 +104,10 @@
|
|||
openMenu("comment-edit-submit-wrapper-" + id);
|
||||
}
|
||||
var ins = $(obj).html();
|
||||
ins = ins.replace('<','<');
|
||||
ins = ins.replace('>','>');
|
||||
ins = ins.replace('&','&');
|
||||
ins = ins.replace('"','"');
|
||||
ins = ins.replace("<","<");
|
||||
ins = ins.replace(">",">");
|
||||
ins = ins.replace("&","&");
|
||||
ins = ins.replace(""",""");
|
||||
$("#comment-edit-text-" + id).val(tmpStr + ins);
|
||||
}
|
||||
|
||||
|
|
@ -120,23 +120,22 @@
|
|||
openMenu("comment-edit-submit-wrapper-" + id);
|
||||
}
|
||||
var ins = $(obj).val();
|
||||
ins = ins.replace('<','<');
|
||||
ins = ins.replace('>','>');
|
||||
ins = ins.replace('&','&');
|
||||
ins = ins.replace('"','"');
|
||||
ins = ins.replace("<","<");
|
||||
ins = ins.replace(">",">");
|
||||
ins = ins.replace("&","&");
|
||||
ins = ins.replace(""",""");
|
||||
$("#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();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -63,5 +63,4 @@
|
|||
|
||||
<div class="comment-edit-end"></div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -142,11 +142,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)
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ function commentOpenUI(obj, id) {
|
|||
$("#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"));
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,10 +13,6 @@
|
|||
<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>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -4,46 +4,7 @@ $(document).ready(function() {
|
|||
$("#profile-jot-text").focus(enableOnUser);
|
||||
$("#profile-jot-text").click(enableOnUser);
|
||||
|
||||
/*$('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
|
||||
|
||||
/*$('.group-edit-icon').hover(
|
||||
function() {
|
||||
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
|
||||
function() {
|
||||
$(this).removeClass('icon'); $(this).addClass('iconspacer');}
|
||||
);
|
||||
|
||||
$('.sidebar-group-element').hover(
|
||||
function() {
|
||||
id = $(this).attr('id');
|
||||
$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
|
||||
|
||||
function() {
|
||||
id = $(this).attr('id');
|
||||
$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
|
||||
);
|
||||
|
||||
|
||||
$('.savedsearchdrop').hover(
|
||||
function() {
|
||||
$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
|
||||
function() {
|
||||
$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
|
||||
);
|
||||
|
||||
$('.savedsearchterm').hover(
|
||||
function() {
|
||||
id = $(this).attr('id');
|
||||
$('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
|
||||
|
||||
function() {
|
||||
id = $(this).attr('id');
|
||||
$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
|
||||
);*/
|
||||
|
||||
|
||||
$('#event-share-checkbox').change(function() {
|
||||
|
||||
if ($('#event-share-checkbox').is(':checked')) {
|
||||
$('#acl-wrapper').show();
|
||||
}
|
||||
|
|
@ -52,7 +13,6 @@ $(document).ready(function() {
|
|||
}
|
||||
}).trigger('change');
|
||||
|
||||
|
||||
$(".popupbox").click(function () {
|
||||
var parent = $( $(this).attr('href') ).parent();
|
||||
if (parent.css('display') == 'none') {
|
||||
|
|
@ -129,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;
|
||||
|
|
@ -265,12 +216,6 @@ function initCrop() {
|
|||
|
||||
|
||||
function showEvent(eventid) {
|
||||
/* $.get(
|
||||
baseurl + window.eventModuleUrl + '/?id=' + eventid,
|
||||
function(data){
|
||||
$.colorbox({html:data});
|
||||
}
|
||||
);*/
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -286,16 +231,11 @@ var plaintext = 'none';//window.editSelect;
|
|||
|
||||
function initEditor(cb) {
|
||||
if (editor==false) {
|
||||
// $("#profile-jot-text-loading").show();
|
||||
if (plaintext == 'none') {
|
||||
// $("#profile-jot-text-loading").hide();
|
||||
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
|
||||
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
|
||||
editor = true;
|
||||
/* $("a#jot-perms-icon").colorbox({
|
||||
'inline' : true,
|
||||
'transition' : 'elastic'
|
||||
});*/
|
||||
|
||||
$("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
|
||||
var parent = $("#profile-jot-acl-wrapper").parent();
|
||||
if (parent.css('display') == 'none') {
|
||||
|
|
@ -303,158 +243,28 @@ function initEditor(cb){
|
|||
} else {
|
||||
parent.hide();
|
||||
}
|
||||
// $("#profile-jot-acl-wrapper").parent().toggle();
|
||||
|
||||
return false;
|
||||
});
|
||||
$(".jothidden").show();
|
||||
if (typeof cb!="undefined") cb();
|
||||
if (typeof cb!="undefined") {
|
||||
cb();
|
||||
}
|
||||
return;
|
||||
}
|
||||
/* tinyMCE.init({
|
||||
theme : "advanced",
|
||||
mode : "specific_textareas",
|
||||
editor_selector: window.editSelect,
|
||||
auto_focus: "profile-jot-text",
|
||||
plugins : "bbcode,paste,autoresize, inlinepopups",
|
||||
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
|
||||
theme_advanced_buttons2 : "",
|
||||
theme_advanced_buttons3 : "",
|
||||
theme_advanced_toolbar_location : "top",
|
||||
theme_advanced_toolbar_align : "center",
|
||||
theme_advanced_blockformats : "blockquote,code",
|
||||
gecko_spellcheck : true,
|
||||
paste_text_sticky : true,
|
||||
entity_encoding : "raw",
|
||||
add_unload_trigger : false,
|
||||
remove_linebreaks : false,
|
||||
//force_p_newlines : false,
|
||||
//force_br_newlines : true,
|
||||
forced_root_block : 'div',
|
||||
convert_urls: false,
|
||||
content_css: "$baseurl/view/custom_tinymce.css",
|
||||
theme_advanced_path : false,
|
||||
file_browser_callback : "fcFileBrowser",
|
||||
setup : function(ed) {
|
||||
cPopup = null;
|
||||
ed.onKeyDown.add(function(ed,e) {
|
||||
if(cPopup !== null)
|
||||
cPopup.onkey(e);
|
||||
});
|
||||
|
||||
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) {
|
||||
$('#character-counter').removeClass('red');
|
||||
$('#character-counter').removeClass('orange');
|
||||
$('#character-counter').addClass('grey');
|
||||
}
|
||||
if((textlen > 140) && (textlen <= 420)) {
|
||||
$('#character-counter').removeClass('grey');
|
||||
$('#character-counter').removeClass('red');
|
||||
$('#character-counter').addClass('orange');
|
||||
}
|
||||
if(textlen > 420) {
|
||||
$('#character-counter').removeClass('grey');
|
||||
$('#character-counter').removeClass('orange');
|
||||
$('#character-counter').addClass('red');
|
||||
}
|
||||
$('#character-counter').text(textlen);
|
||||
});
|
||||
|
||||
ed.onInit.add(function(ed) {
|
||||
ed.pasteAsPlainText = true;
|
||||
$("#profile-jot-text-loading").hide();
|
||||
$(".jothidden").show();
|
||||
if (typeof cb!="undefined") cb();
|
||||
});
|
||||
|
||||
}
|
||||
});
|
||||
editor = true;
|
||||
// setup acl popup
|
||||
$("a#jot-perms-icon").colorbox({
|
||||
'inline' : true,
|
||||
'transition' : 'elastic'
|
||||
}); */
|
||||
} else {
|
||||
if (typeof cb!="undefined") cb();
|
||||
}
|
||||
}
|
||||
|
||||
function enableOnUser() {
|
||||
if (editor) return;
|
||||
if (editor) {
|
||||
return;
|
||||
}
|
||||
$(this).val("");
|
||||
initEditor();
|
||||
}
|
||||
|
||||
/*function wallInitEditor() {
|
||||
var plaintext = window.editSelect;
|
||||
|
||||
if(plaintext != 'none') {
|
||||
tinyMCE.init({
|
||||
theme : "advanced",
|
||||
mode : "specific_textareas",
|
||||
editor_selector: /(profile-jot-text|prvmail-text)/,
|
||||
plugins : "bbcode,paste",
|
||||
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
|
||||
theme_advanced_buttons2 : "",
|
||||
theme_advanced_buttons3 : "",
|
||||
theme_advanced_toolbar_location : "top",
|
||||
theme_advanced_toolbar_align : "center",
|
||||
theme_advanced_blockformats : "blockquote,code",
|
||||
gecko_spellcheck : true,
|
||||
paste_text_sticky : true,
|
||||
entity_encoding : "raw",
|
||||
add_unload_trigger : false,
|
||||
remove_linebreaks : false,
|
||||
//force_p_newlines : false,
|
||||
//force_br_newlines : true,
|
||||
forced_root_block : 'div',
|
||||
convert_urls: false,
|
||||
content_css: baseurl + "/view/custom_tinymce.css",
|
||||
//Character count
|
||||
theme_advanced_path : false,
|
||||
setup : function(ed) {
|
||||
ed.onInit.add(function(ed) {
|
||||
ed.pasteAsPlainText = true;
|
||||
var editorId = ed.editorId;
|
||||
var textarea = $('#'+editorId);
|
||||
if (typeof(textarea.attr('tabindex')) != "undefined") {
|
||||
$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
|
||||
textarea.attr('tabindex', null);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
else
|
||||
$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
|
||||
}*/
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Jot
|
||||
*/
|
||||
|
|
@ -464,8 +274,6 @@ function addeditortext(textElem, data) {
|
|||
var currentText = $(textElem).val();
|
||||
$(textElem).val(currentText + data);
|
||||
}
|
||||
/* else
|
||||
tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
|
||||
}
|
||||
|
||||
function jotVideoURL() {
|
||||
|
|
@ -517,29 +325,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();
|
||||
|
|
@ -555,24 +340,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) {
|
||||
|
|
@ -591,7 +358,6 @@ function itemTag(id) {
|
|||
}
|
||||
|
||||
function itemFiler(id) {
|
||||
|
||||
$.get('filer/', function(data) {
|
||||
|
||||
var promptText = $('#id_term_label', data).text();
|
||||
|
|
@ -601,51 +367,14 @@ 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 = "";
|
||||
|
|
@ -699,16 +428,6 @@ 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) {
|
||||
|
||||
var tmpStr = $("#comment-edit-text-" + id).val();
|
||||
|
|
@ -745,5 +464,3 @@ function cmtBbOpen(id) {
|
|||
function cmtBbClose(id) {
|
||||
$(".comment-edit-bb-" + id).hide();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,33 +1,14 @@
|
|||
|
||||
{{*<!-- <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}}"
|
||||
|
|
@ -44,18 +25,7 @@
|
|||
<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>-->*}}
|
||||
</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>
|
||||
{{if $qcomment}}
|
||||
<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -12,11 +12,6 @@ $(document).ready(function() {
|
|||
'#system-menu-list-closing': false
|
||||
};
|
||||
|
||||
/* $.ajaxSetup({
|
||||
cache: false
|
||||
});*/
|
||||
|
||||
|
||||
/* enable tinymce 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,12 +57,6 @@ $(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')) {
|
||||
|
|
@ -80,20 +67,6 @@ $(document).ready(function() {
|
|||
}
|
||||
}).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 +215,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 +231,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 +238,6 @@ $(document).ready(function() {
|
|||
});
|
||||
}
|
||||
});
|
||||
/*$.each(cBoxClasses, function(){
|
||||
$('.'+this).colorbox({
|
||||
maxHeight: '90%',
|
||||
photo: true,
|
||||
rel: this
|
||||
});
|
||||
});*/
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
|
@ -320,7 +274,9 @@ $(function(){
|
|||
console.log(":)", url, data);
|
||||
|
||||
$.post(url, data, function(data) {
|
||||
if(timer) clearTimeout(timer);
|
||||
if (timer) {
|
||||
clearTimeout(timer);
|
||||
}
|
||||
NavUpdate();
|
||||
$.colorbox.close();
|
||||
})
|
||||
|
|
@ -396,51 +352,6 @@ 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']) {
|
||||
|
|
@ -742,37 +653,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);
|
||||
|
|
@ -822,25 +702,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();
|
||||
// }
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -885,8 +755,6 @@ function itemTag(id) {
|
|||
$('body').css('cursor', 'wait');
|
||||
|
||||
$.get('tagger/' + id + '?term=' + reply, NavUpdate);
|
||||
/*if(timer) clearTimeout(timer);
|
||||
timer = setTimeout(NavUpdate,3000);*/
|
||||
liking = 1;
|
||||
}
|
||||
}
|
||||
|
|
@ -913,8 +781,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 {
|
||||
|
|
@ -1020,13 +886,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();
|
||||
}
|
||||
}*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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,10 +8,7 @@
|
|||
<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}}"
|
||||
|
|
@ -53,8 +35,6 @@
|
|||
style="cursor: pointer;" title="{{$edvideo}}"
|
||||
data-role="insert-formatting" data-comment="{{$comment}}" 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>
|
||||
{{if $qcomment}}
|
||||
<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -47,7 +47,4 @@ $(".comment-edit-bb-" + id).show();
|
|||
function cmtBbClose(id) {
|
||||
$(".comment-edit-bb-" + id).hide();
|
||||
}
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ function vier_init(&$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
|
||||
|
|
@ -66,7 +66,6 @@ function insertFormatting(comment,BBcode,id) {
|
|||
return true;
|
||||
}
|
||||
|
||||
|
||||
function showThread(id) {
|
||||
$("#collapsed-comments-" + id).show()
|
||||
$("#collapsed-comments-" + id + " .collapsed-comments").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) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue