nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[frio] Fix comment box not opening on focus, undefined on blur

Browse source 
- Remove the callback system for commentOpenUI
- Remove comments

Fixes #3062
This commit is contained in:
Hypolite Petovan 2017-02-16 07:06:11 -05:00
parent be7041c3e0
commit 3cdfaa4fad
2 changed files with 22 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
view/theme/frio/js/textedit.js
View file

@ -81,39 +81,25 @@ function showHideCommentBox(id) {
} }
function commentOpenUI(obj, id) { function commentOpenUI(obj, id) {
$(document).unbind( "click.commentOpen", handler ); $("#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)
var handler = function() { // The submit button gets tabindex + 1
if (obj.value == '') { $("#comment-edit-text-" + id).attr('tabindex','9');
$("#comment-edit-text-" + id).addClass("comment-edit-text-full").removeClass("comment-edit-text-empty"); $("#comment-edit-submit-" + id).attr('tabindex','10');
// Choose an arbitrary tab index that's greater than what we're using in jot (3 of them) $("#comment-edit-submit-wrapper-" + id).show();
// The submit button gets tabindex + 1 // initialize autosize for this comment
$("#comment-edit-text-" + id).attr('tabindex','9'); autosize($("#comment-edit-text-" + id + ".text-autosize"));
$("#comment-edit-submit-" + id).attr('tabindex','10');
$("#comment-edit-submit-wrapper-" + id).show();
// initialize autosize for this comment
autosize($("#comment-edit-text-" + id + ".text-autosize"));
}
};
$(document).bind( "click.commentOpen", handler );
} }
function commentCloseUI(obj, id) { function commentCloseUI(obj, id) {
$(document).unbind( "click.commentClose", handler ); if (obj.value === '') {
$("#comment-edit-text-" + id).removeClass("comment-edit-text-full").addClass("comment-edit-text-empty");
var handler = function() { $("#comment-edit-text-" + id).removeAttr('tabindex');
if (obj.value === '') { $("#comment-edit-submit-" + id).removeAttr('tabindex');
$("#comment-edit-text-" + id).removeClass("comment-edit-text-full").addClass("comment-edit-text-empty"); $("#comment-edit-submit-wrapper-" + id).hide();
$("#comment-edit-text-" + id).removeAttr('tabindex'); // destroy the automatic textarea resizing
$("#comment-edit-submit-" + id).removeAttr('tabindex'); autosize.destroy($("#comment-edit-text-" + id + ".text-autosize"));
$("#comment-edit-submit-wrapper-" + id).hide(); }
// destroy the automatic textarea resizing
autosize.destroy($("#comment-edit-text-" + id + ".text-autosize"));
}
};
$(document).bind( "click.commentClose", handler );
} }
function jotTextOpenUI(obj) { function jotTextOpenUI(obj) {

45
view/theme/frio/js/theme.js
View file

@ -10,7 +10,7 @@ $(document).ready(function(){
$("#back-to-top").fadeOut(); $("#back-to-top").fadeOut();
} }
}); });
// scroll body to 0px on click // scroll body to 0px on click
$("#back-to-top").click(function () { $("#back-to-top").click(function () {
$("body,html").animate({ $("body,html").animate({
@ -54,7 +54,7 @@ $(document).ready(function(){
} }
// make responsive tabmenu with flexmenu.js // make responsive tabmenu with flexmenu.js
// the menupoints which doesn't fit in the second nav bar will moved to a // the menupoints which doesn't fit in the second nav bar will moved to a
// dropdown menu. Look at common_tabs.tpl // dropdown menu. Look at common_tabs.tpl
$("ul.tabs.flex-nav").flexMenu({ $("ul.tabs.flex-nav").flexMenu({
'cutoff': 2, 'cutoff': 2,
@ -82,17 +82,17 @@ $(document).ready(function(){
return false; return false;
} }
}); });
if(checked == true) { if(checked == true) {
$("a#item-delete-selected").fadeTo(400, 1); $("a#item-delete-selected").fadeTo(400, 1);
$("a#item-delete-selected").show(); $("a#item-delete-selected").show();
} else { } else {
$("a#item-delete-selected").fadeTo(400, 0, function(){ $("a#item-delete-selected").fadeTo(400, 0, function(){
$("a#item-delete-selected").hide(); $("a#item-delete-selected").hide();
}); });
} }
}); });
//$('ul.flex-nav').flexMenu(); //$('ul.flex-nav').flexMenu();
// initialize the bootstrap tooltips // initialize the bootstrap tooltips
@ -128,7 +128,7 @@ $(document).ready(function(){
// append the new heading to the navbar // append the new heading to the navbar
$("#topbar-second > .container > #tabmenu").append(newText); $("#topbar-second > .container > #tabmenu").append(newText);
// try to get the value of the original search input to insert it // try to get the value of the original search input to insert it
// as value in the nav-search-input // as value in the nav-search-input
var searchValue = $("#search-wrapper .form-group-search input").val(); var searchValue = $("#search-wrapper .form-group-search input").val();
@ -257,39 +257,6 @@ $(document).ready(function(){
}); });
}); });
//function commentOpenUI(obj, id) {
// $(document).unbind( "click.commentOpen", handler );
//
// var handler = function() {
// if(obj.value == '{{$comment}}') {
// 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();
// }
// };
//
// $(document).bind( "click.commentOpen", handler );
//}
//
//function commentCloseUI(obj, id) {
// $(document).unbind( "click.commentClose", handler );
//
// var handler = function() {
// if(obj.value === '') {
// obj.value = '{{$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');
// $("#comment-edit-submit-wrapper-" + id).hide();
// }
// };
//
// $(document).bind( "click.commentClose", handler );
//}
function openClose(theID) { function openClose(theID) {
var elem = document.getElementById(theID); var elem = document.getElementById(theID);