X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrost-mobile%2Fjs%2Ftheme.js;h=8133c602c86c0935894ad3763c2c90167d8d291a;hb=fcf7a791f1979b77a64275f63d0b0b3602fb1d36;hp=83a0f172bc9e9ee9d687a6d0388f2339b08442a6;hpb=1f09e7ad23f1f3982f44e9b2c9a1e6d08da7f825;p=friendica.git

diff --git a/view/theme/frost-mobile/js/theme.js b/view/theme/frost-mobile/js/theme.js
index 83a0f172bc..8133c602c8 100644
--- a/view/theme/frost-mobile/js/theme.js
+++ b/view/theme/frost-mobile/js/theme.js
@@ -1,100 +1,159 @@
-$j(document).ready(function() {
+$(document).ready(function() {
 
-		/* enable tinymce on focus and click */
-		$j("#profile-jot-text").focus(enableOnUser);
-		$j("#profile-jot-text").click(enableOnUser);
+	/* enable tinymce on focus and click */
+	$("#profile-jot-text").focus(enableOnUser);
+	$("#profile-jot-text").click(enableOnUser);
 
-	if(typeof window.AjaxUpload != "undefined") {
-		switch(window.ajaxType) {
-			case 'jot-header':
-				var uploader = new window.AjaxUpload(
-					'wall-image-upload',
-					{ action: 'wall_upload/'+window.nickname,
-						name: 'userfile',
-						onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
-						onComplete: function(file,response) {
-							addeditortext(response);
-							$j('#profile-rotator').hide();
-						}				 
-					}
-				);
-
-				var file_uploader = new window.AjaxUpload(
-					'wall-file-upload',
-					{ action: 'wall_attach/'+window.nickname,
-						name: 'userfile',
-						onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
-						onComplete: function(file,response) {
-							addeditortext(response);
-							$j('#profile-rotator').hide();
-						}				 
-					}
-				);
-				break;
-			case 'msg-header':
-				var uploader = new window.AjaxUpload(
-					'prvmail-upload',
-					{ action: 'wall_upload/' + window.nickname,
-						name: 'userfile',
-						onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
-						onComplete: function(file,response) {
-							tinyMCE.execCommand('mceInsertRawHTML',false,response);
-							$j('#profile-rotator').hide();
-						}				 
-					}
-				);
-				break;
-			default:
-				break;
-		}
-	}
-
-	if(typeof acl=="undefined"){
-		acl = new ACL(
-			baseurl+"/acl",
-			[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
-		);
-	}
+/*$('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
 
-/*$j('html').click(function() { $j("#nav-notifications-menu" ).hide(); });*/
-
-	/*$j('.group-edit-icon').hover(
+	/*$('.group-edit-icon').hover(
 		function() {
-			$j(this).addClass('icon'); $j(this).removeClass('iconspacer');},
+			$(this).addClass('icon'); $(this).removeClass('iconspacer');},
 		function() {
-			$j(this).removeClass('icon'); $j(this).addClass('iconspacer');}
+			$(this).removeClass('icon'); $(this).addClass('iconspacer');}
 	);
 
-	$j('.sidebar-group-element').hover(
+	$('.sidebar-group-element').hover(
 		function() {
-			id = $j(this).attr('id');
-			$j('#edit-' + id).addClass('icon'); $j('#edit-' + id).removeClass('iconspacer');},
+			id = $(this).attr('id');
+			$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
 
 		function() {
-			id = $j(this).attr('id');
-			$j('#edit-' + id).removeClass('icon');$j('#edit-' + id).addClass('iconspacer');}
+			id = $(this).attr('id');
+			$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
 	);
 
 
-	$j('.savedsearchdrop').hover(
+	$('.savedsearchdrop').hover(
 		function() {
-			$j(this).addClass('drop'); $j(this).addClass('icon'); $j(this).removeClass('iconspacer');},
+			$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
 		function() {
-			$j(this).removeClass('drop'); $j(this).removeClass('icon'); $j(this).addClass('iconspacer');}
+			$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
 	);
 
-	$j('.savedsearchterm').hover(
+	$('.savedsearchterm').hover(
 		function() {
-			id = $j(this).attr('id');
-			$j('#drop-' + id).addClass('icon'); 	$j('#drop-' + id).addClass('drophide'); $j('#drop-' + id).removeClass('iconspacer');},
+			id = $(this).attr('id');
+			$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
 
 		function() {
-			id = $j(this).attr('id');
-			$j('#drop-' + id).removeClass('icon');$j('#drop-' + id).removeClass('drophide'); $j('#drop-' + id).addClass('iconspacer');}
+			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();
+		}
+		else {
+			$('#acl-wrapper').hide();
+		}
+	}).trigger('change');
+
+
+	$(".popupbox").click(function () {
+		var parent = $( $(this).attr('href') ).parent();
+		if (parent.css('display') == 'none') {
+			parent.show();
+		} else {
+			parent.hide();
+		}
+		return false;
+	});
+
+
+
+	if(typeof window.AjaxUpload != "undefined") {
+		var uploader = new window.AjaxUpload(
+			window.imageUploadButton,
+			{ action: 'wall_upload/'+window.nickname+'?nomce=1',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(window.jotId, response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+		if($('#wall-file-upload').length) {
+			var file_uploader = new window.AjaxUpload(
+				'wall-file-upload',
+				{ action: 'wall_attach/'+window.nickname+'?nomce=1',
+					name: 'userfile',
+					onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+					onComplete: function(file,response) {
+						addeditortext(window.jotId, response);
+						$('#profile-rotator').hide();
+					}				 
+				}
+			);
+		}
+	}
+
+
+	if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
+		acl = new ACL(
+			baseurl+"/acl",
+			[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
+		);
+	}
+
+	switch(window.autocompleteType) {
+		case 'msg-header':
+			var a = $("#recip").autocomplete({ 
+				serviceUrl: baseurl + '/acl',
+				minChars: 2,
+				width: 350,
+				onSelect: function(value,data) {
+					$("#recip-complete").val(data);
+				}			
+			});
+			break;
+		case 'contacts-head':
+			var a = $("#contacts-search").autocomplete({ 
+				serviceUrl: baseurl + '/acl',
+				minChars: 2,
+				width: 350,
+			});
+			a.setOptions({ params: { type: 'a' }});
+			break;
+		case 'display-head':
+			$(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+			break;
+		default:
+			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;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+			}
+
+		}).trigger('change');
+	}
+
 	if(window.aclType == "event_head") {
-		$j('#events-calendar').fullCalendar({
+		$('#events-calendar').fullCalendar({
 			events: baseurl + '/events/json/',
 			header: {
 				left: 'prev,next today',
@@ -144,7 +203,7 @@ $j(document).ready(function() {
 		// center on date
 		var args=location.href.replace(baseurl,"").split("/");
 		if (args.length>=4) {
-			$j("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
+			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
 		} 
 		
 		// show event popup
@@ -152,75 +211,14 @@ $j(document).ready(function() {
 		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
 	}	
 
-	if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
-		$j('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$j('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $j(this).text();
-				$j('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$j('#jot-public').hide();
-			});
-			if(selstr == null) { 
-				$j('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$j('#jot-public').show();
-			}
-
-		}).trigger('change');
-	}
-
-	switch(window.autocompleteType) {
-		case 'msg-header':
-			var a = $j("#recip").autocomplete({ 
-				serviceUrl: baseurl + '/acl',
-				minChars: 2,
-				width: 350,
-				onSelect: function(value,data) {
-					$j("#recip-complete").val(data);
-				}			
-			});
-			break;
-		case 'contacts-head':
-			var a = $j("#contacts-search").autocomplete({ 
-				serviceUrl: baseurl + '/acl',
-				minChars: 2,
-				width: 350,
-			});
-			a.setOptions({ params: { type: 'a' }});
-			break;
-		default:
-			break;
-	}
-
-
-	$j('#event-share-checkbox').change(function() {
-
-		if ($j('#event-share-checkbox').is(':checked')) { 
-			$j('#acl-wrapper').show();
-		}
-		else {
-			$j('#acl-wrapper').hide();
-		}
-	}).trigger('change');
-
-
-	$j(".popupbox").click(function () {
-		var parent = $j( $j(this).attr('href') ).parent();
-		if (parent.css('display') == 'none') {
-			parent.show();
-		} else {
-			parent.hide();
-		}
-		return false;
-	});
-
 });
 
 // update pending count //
-$j(function(){
+$(function(){
 
-	$j("nav").bind('nav-update',  function(e,data){
-		var elm = $j('#pending-update');
-		var register = $j(data).find('register').text();
+	$("nav").bind('nav-update',  function(e,data){
+		var elm = $('#pending-update');
+		var register = $(data).find('register').text();
 		if (register=="0") { register=""; elm.hide();} else { elm.show(); }
 		elm.html(register);
 	});
@@ -228,74 +226,83 @@ $j(function(){
 
 
 
-function insertFormatting(comment,BBcode,id) {
-	
-	var tmpStr = $j("#comment-edit-text-" + id).val();
-	if(tmpStr == comment) {
-		tmpStr = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		openMenu("comment-edit-submit-wrapper-" + id);
-		$j("#comment-edit-text-" + id).val(tmpStr);
-	}
+function homeRedirect() {
+	$('html').fadeOut('slow', function(){
+		window.location = baseurl + "/login";
+	});
+}
 
-	textarea = document.getElementById("comment-edit-text-" +id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} 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
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+
+function initCrop() {
+	function onEndCrop( coords, dimensions ) {
+		$PR( 'x1' ).value = coords.x1;
+		$PR( 'y1' ).value = coords.y1;
+		$PR( 'x2' ).value = coords.x2;
+		$PR( 'y2' ).value = coords.y2;
+		$PR( 'width' ).value = dimensions.width;
+		$PR( 'height' ).value = dimensions.height;
 	}
-	return true;
-}
 
-function cmtBbOpen(id) {
-	$j(".comment-edit-bb-" + id).show();
+	Event.observe( window, 'load', function() {
+		new Cropper.ImgWithPreview(
+		'croppa',
+		{
+			previewWrap: 'previewWrap',
+			minWidth: 175,
+			minHeight: 175,
+			maxWidth: 640,
+			maxHeight: 640,
+			ratioDim: { x: 100, y:100 },
+			displayOnInit: true,
+			onEndCrop: onEndCrop
+		});
+	});
 }
-function cmtBbClose(id) {
-	$j(".comment-edit-bb-" + id).hide();
+
+
+function showEvent(eventid) {
+/*	$.get(
+		baseurl + '/events/?id='+eventid,
+		function(data){
+			$.colorbox({html:data});
+		}
+	);*/			
 }
 
 
 
+/*
+ * TinyMCE/Editor
+ */
 
 var editor=false;
 var textlen = 0;
 var plaintext = 'none';//window.editSelect;
-	var ispublic = window.isPublic;
+//var ispublic = window.isPublic;
 
 function initEditor(cb){
 	if (editor==false){
-//		$j("#profile-jot-text-loading").show();
+//		$("#profile-jot-text-loading").show();
 		if(plaintext == 'none') {
-//			$j("#profile-jot-text-loading").hide();
-			$j("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+//			$("#profile-jot-text-loading").hide();
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
 			editor = true;
-/*			$j("a#jot-perms-icon").fancybox({
-				'transitionIn' : 'none',
-				'transitionOut' : 'none'
+/*			$("a#jot-perms-icon").colorbox({
+				'inline' : true,
+				'transition' : 'elastic'
 			});*/
-			$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
-				var parent = $j("#profile-jot-acl-wrapper").parent();
+			$("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
+				var parent = $("#profile-jot-acl-wrapper").parent();
 				if (parent.css('display') == 'none') {
 					parent.show();
 				} else {
 					parent.hide();
 				}
-//				$j("#profile-jot-acl-wrapper").parent().toggle();
+//				$("#profile-jot-acl-wrapper").parent().toggle();
 				return false;
 			});
-			$j(".jothidden").show();
+			$(".jothidden").show();
 			if (typeof cb!="undefined") cb();
 			return;
 		}	
@@ -316,9 +323,9 @@ function initEditor(cb){
 			entity_encoding : "raw",
 			add_unload_trigger : false,
 			remove_linebreaks : false,
-			force_p_newlines : false,
-			force_br_newlines : true,
-			forced_root_block : '',
+			//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,
@@ -345,37 +352,37 @@ function initEditor(cb){
 					}
 
 					textlen = txt.length;
-					if(textlen != 0 && $j('#jot-perms-icon').is('.unlock')) {
-						$j('#profile-jot-desc').html(ispublic);
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+						$('#profile-jot-desc').html(ispublic);
 					}
 					else {
-						$j('#profile-jot-desc').html(' ');
+						$('#profile-jot-desc').html(' ');
 					}	 
 
 				 //Character count
 
 					if(textlen <= 140) {
-						$j('#character-counter').removeClass('red');
-						$j('#character-counter').removeClass('orange');
-						$j('#character-counter').addClass('grey');
+						$('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('grey');
 					}
 					if((textlen > 140) && (textlen <= 420)) {
-						$j('#character-counter').removeClass('grey');
-						$j('#character-counter').removeClass('red');
-						$j('#character-counter').addClass('orange');
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('red');
+						$('#character-counter').addClass('orange');
 					}
 					if(textlen > 420) {
-						$j('#character-counter').removeClass('grey');
-						$j('#character-counter').removeClass('orange');
-						$j('#character-counter').addClass('red');
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('red');
 					}
-					$j('#character-counter').text(textlen);
+					$('#character-counter').text(textlen);
 				});
 
 				ed.onInit.add(function(ed) {
 					ed.pasteAsPlainText = true;
-					$j("#profile-jot-text-loading").hide();
-					$j(".jothidden").show();
+					$("#profile-jot-text-loading").hide();
+					$(".jothidden").show();
 					if (typeof cb!="undefined") cb();
 				});
 
@@ -383,9 +390,9 @@ function initEditor(cb){
 		});
 		editor = true;
 		// setup acl popup
-		$j("a#jot-perms-icon").fancybox({
-			'transitionIn' : 'elastic',
-			'transitionOut' : 'elastic'
+		$("a#jot-perms-icon").colorbox({
+			'inline' : true,
+			'transition' : 'elastic'
 		}); */
 	} else {
 		if (typeof cb!="undefined") cb();
@@ -394,11 +401,11 @@ function initEditor(cb){
 
 function enableOnUser(){
 	if (editor) return;
-	$j(this).val("");
+	$(this).val("");
 	initEditor();
 }
 
-function wallInitEditor() {
+/*function wallInitEditor() {
 	var plaintext = window.editSelect;
 
 	if(plaintext != 'none') {
@@ -418,9 +425,9 @@ function wallInitEditor() {
 			entity_encoding : "raw",
 			add_unload_trigger : false,
 			remove_linebreaks : false,
-			force_p_newlines : false,
-			force_br_newlines : true,
-			forced_root_block : '',
+			//force_p_newlines : false,
+			//force_br_newlines : true,
+			forced_root_block : 'div',
 			convert_urls: false,
 			content_css: baseurl + "/view/custom_tinymce.css",
 				 //Character count
@@ -429,9 +436,9 @@ function wallInitEditor() {
 				ed.onInit.add(function(ed) {
 					ed.pasteAsPlainText = true;
 					var editorId = ed.editorId;
-					var textarea = $j('#'+editorId);
+					var textarea = $('#'+editorId);
 					if (typeof(textarea.attr('tabindex')) != "undefined") {
-						$j('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+						$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
 						textarea.attr('tabindex', null);
 					}
 				});
@@ -439,238 +446,128 @@ function wallInitEditor() {
 		});
 	}
 	else
-		$j("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-}
-
-
-
-
-function initCrop() {
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		});
-	});
-}
-
-
-function confirmDelete() { return confirm(window.delItem); }
-function commentOpen(obj,id) {
-	if(obj.value == window.commentEmptyText) {
-		obj.value = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		$j("#mod-cmnt-wrap-" + id).show();
-		openMenu("comment-edit-submit-wrapper-" + id);
-	}
-}
-function commentClose(obj,id) {
-	if(obj.value == "") {
-		obj.value = window.commentEmptyText;
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
-		$j("#mod-cmnt-wrap-" + id).hide();
-		closeMenu("comment-edit-submit-wrapper-" + id);
-	}
-}
+		$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+}*/
 
 
-function commentInsert(obj,id) {
-	var tmpStr = $j("#comment-edit-text-" + id).val();
-	if(tmpStr == window.commentEmptyText) {
-		tmpStr = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		openMenu("comment-edit-submit-wrapper-" + id);
-	}
-	var ins = $j(obj).html();
-	ins = ins.replace("&lt;","<");
-	ins = ins.replace("&gt;",">");
-	ins = ins.replace("&amp;","&");
-	ins = ins.replace("&quot;",'"');
-	$j("#comment-edit-text-" + id).val(tmpStr + ins);
-}
 
-function qCommentInsert(obj,id) {
-	var tmpStr = $j("#comment-edit-text-" + id).val();
-	if(tmpStr == window.commentEmptyText) {
-		tmpStr = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		openMenu("comment-edit-submit-wrapper-" + id);
-	}
-	var ins = $j(obj).val();
-	ins = ins.replace("&lt;","<");
-	ins = ins.replace("&gt;",">");
-	ins = ins.replace("&amp;","&");
-	ins = ins.replace("&quot;",'"');
-	$j("#comment-edit-text-" + id).val(tmpStr + ins);
-	$j(obj).val("");
-}
+/*
+ * Jot
+ */
 
-function showHideComments(id) {
-	if( $j("#collapsed-comments-" + id).is(":visible")) {
-		$j("#collapsed-comments-" + id).hide();
-		$j("#hide-comments-" + id).html(window.showMore);
-	}
-	else {
-		$j("#collapsed-comments-" + id).show();
-		$j("#hide-comments-" + id).html(window.showFewer);
+function addeditortext(textElem, data) {
+	if(window.editSelect == 'none') {
+		var currentText = $(textElem).val();
+		$(textElem).val(currentText + data);
 	}
+/*	else
+		tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
 }
 
-
-/*function deleteCheckedItems() {
-	var checkedstr = '';
-
-	$j('.item-select').each( function() {
-		if($j(this).is(':checked')) {
-			if(checkedstr.length != 0) {
-				checkedstr = checkedstr + ',' + $j(this).val();
-			}
-			else {
-				checkedstr = $j(this).val();
-			}
-		}	
-	});
-	$j.post('item', { dropitems: checkedstr }, function(data) {
-		window.location.reload();
-	});
-}*/
-
 function jotVideoURL() {
 	reply = prompt(window.vidURL);
 	if(reply && reply.length) {
-		addeditortext('[video]' + reply + '[/video]');
+		addeditortext("#profile-jot-text", '[video]' + reply + '[/video]');
 	}
 }
 
 function jotAudioURL() {
 	reply = prompt(window.audURL);
 	if(reply && reply.length) {
-		addeditortext('[audio]' + reply + '[/audio]');
+		addeditortext("#profile-jot-text", '[audio]' + reply + '[/audio]');
 	}
 }
 
 
 function jotGetLocation() {
-	reply = prompt(window.whereAreU, $j('#jot-location').val());
+	reply = prompt(window.whereAreU, $('#jot-location').val());
 	if(reply && reply.length) {
-		$j('#jot-location').val(reply);
+		$('#jot-location').val(reply);
 	}
 }
 
 function jotShare(id) {
-	if ($j('#jot-popup').length != 0) $j('#jot-popup').show();
+	if ($('#jot-popup').length != 0) $('#jot-popup').show();
 
-	$j('#like-rotator-' + id).show();
-	$j.get('share/' + id, function(data) {
-		if (!editor) $j("#profile-jot-text").val("");
+	$('#like-rotator-' + id).show();
+	$.get('share/' + id, function(data) {
+		if (!editor) $("#profile-jot-text").val("");
 		initEditor(function(){
-			addeditortext(data);
-			$j('#like-rotator-' + id).hide();
-			$j(window).scrollTop(0);
+			addeditortext("#profile-jot-text", data);
+			$('#like-rotator-' + id).hide();
+			$(window).scrollTop(0);
 		});
 
 	});
 }
 
-function linkdropper(event) {
+function jotGetLink() {
+	reply = prompt(window.linkURL);
+	if(reply && reply.length) {
+		reply = bin2hex(reply);
+		$('#profile-rotator').show();
+		$.get('parse_url?binurl=' + reply, function(data) {
+			addeditortext(window.jotId, data);
+			$('#profile-rotator').hide();
+		});
+	}
+}
+
+/*function linkdropper(event) {
 	var linkFound = event.dataTransfer.types.contains("text/uri-list");
 	if(linkFound)
 		event.preventDefault();
 }
 
-switch(window.ajaxType) {
-	case 'jot-header':
-		function jotGetLink() {
-			reply = prompt(window.linkURL);
-			if(reply && reply.length) {
-				reply = bin2hex(reply);
-				$j('#profile-rotator').show();
-				$j.get('parse_url?binurl=' + reply, function(data) {
-					addeditortext(data);
-					$j('#profile-rotator').hide();
-				});
-			}
-		}
+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 linkdrop(event) {
-			var reply = event.dataTransfer.getData("text/uri-list");
-			event.target.textContent = reply;
-			event.preventDefault();
-			if(reply && reply.length) {
-				reply = bin2hex(reply);
-				$j('#profile-rotator').show();
-				$j.get('parse_url?binurl=' + reply, function(data) {
-					if (!editor) $j("#profile-jot-text").val("");
-					initEditor(function(){
-						addeditortext(data);
-						$j('#profile-rotator').hide();
-					});
-				});
-			}
-		}
-		break;
-	case 'msg-header':
-	case 'wallmsg-header':
-// TINYMCE -- BAD
-		function jotGetLink() {
-			reply = prompt(window.linkURL);
-			if(reply && reply.length) {
-				$j('#profile-rotator').show();
-				$j.get('parse_url?url=' + reply, function(data) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,data);
-					$j('#profile-rotator').hide();
-				});
-			}
-		}
+function jotClearLocation() {
+	$('#jot-coord').val('');
+	$('#profile-nolocation-wrapper').hide();
+}
 
-		function linkdrop(event) {
-			var reply = event.dataTransfer.getData("text/uri-list");
-			event.target.textContent = reply;
-			event.preventDefault();
-			if(reply && reply.length) {
-				$j('#profile-rotator').show();
-				$j.get('parse_url?url=' + reply, function(data) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,data);
-					$j('#profile-rotator').hide();
-				});
-			}
-		}
+if(typeof window.geoTag === 'function') window.geoTag();
 
-		break;
-	default:
-		break;
-}
 
-function showEvent(eventid) {
-/*	$j.get(
-		baseurl + '/events/?id='+eventid,
-		function(data){
-			$j.fancybox(data);
-		}
-	);*/			
-}
 
+/*
+ * Items
+ */
+
+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);
@@ -679,9 +576,9 @@ function itemTag(id) {
 		if(reply.length) {
 
 			commentBusy = true;
-			$j('body').css('cursor', 'wait');
+			$('body').css('cursor', 'wait');
 
-			$j.get('tagger/' + id + '?term=' + reply, NavUpdate);
+			$.get('tagger/' + id + '?term=' + reply, NavUpdate);
 			/*if(timer) clearTimeout(timer);
 			timer = setTimeout(NavUpdate,3000);*/
 			liking = 1;
@@ -691,46 +588,46 @@ function itemTag(id) {
 
 function itemFiler(id) {
 	
-	$j.get('filer/', function(data){
+	$.get('filer/', function(data){
 
-		var promptText = $j('#id_term_label', data).text();
+		var promptText = $('#id_term_label', data).text();
 
 		reply = prompt(promptText);
 		if(reply && reply.length) {
 			commentBusy = true;
-			$j('body').css('cursor', 'wait');
-			$j.get('filer/' + id + '?term=' + reply, NavUpdate);
+			$('body').css('cursor', 'wait');
+			$.get('filer/' + id + '?term=' + reply, NavUpdate);
 /*				if(timer) clearTimeout(timer);
 			timer = setTimeout(NavUpdate,3000);*/
 			liking = 1;
-/*				$j.fancybox.close();*/
+/*				$.colorbox.close();*/
 		}
 	});
 
-/*		var bordercolor = $j("input").css("border-color");
+/*		var bordercolor = $("input").css("border-color");
 	
-	$j.get('filer/', function(data){
-		$j.fancybox(data);
-		$j("#id_term").keypress(function(){
-			$j(this).css("border-color",bordercolor);
+	$.get('filer/', function(data){
+		$.colorbox({html:data});
+		$("#id_term").keypress(function(){
+			$(this).css("border-color",bordercolor);
 		})
-		$j("#select_term").change(function(){
-			$j("#id_term").css("border-color",bordercolor);
+		$("#select_term").change(function(){
+			$("#id_term").css("border-color",bordercolor);
 		})
 		
-		$j("#filer_save").click(function(e){
+		$("#filer_save").click(function(e){
 			e.preventDefault();
-			reply = $j("#id_term").val();
+			reply = $("#id_term").val();
 			if(reply && reply.length) {
 				commentBusy = true;
-				$j('body').css('cursor', 'wait');
-				$j.get('filer/' + id + '?term=' + reply);
+				$('body').css('cursor', 'wait');
+				$.get('filer/' + id + '?term=' + reply);
 				if(timer) clearTimeout(timer);
 				timer = setTimeout(NavUpdate,3000);
 				liking = 1;
-				$j.fancybox.close();
+				$.colorbox.close();
 			} else {
-				$j("#id_term").css("border-color","#FF0000");
+				$("#id_term").css("border-color","#FF0000");
 			}
 			return false;
 		});
@@ -738,20 +635,111 @@ function itemFiler(id) {
 */		
 }
 
-function jotClearLocation() {
-	$j('#jot-coord').val('');
-	$j('#profile-nolocation-wrapper').hide();
+
+
+/*
+ * Comments
+ */
+
+
+function commentOpen(obj,id) {
+	if(obj.value == window.commentEmptyText) {
+		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();
+		openMenu("comment-edit-submit-wrapper-" + 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();
+		closeMenu("comment-edit-submit-wrapper-" + id);
+	}
+}
+
 
-function addeditortext(data) {
-	if(plaintext == 'none') {
-		var currentText = $j("#profile-jot-text").val();
-		$j("#profile-jot-text").val(currentText + data);
+function commentInsert(obj,id) {
+	var tmpStr = $("#comment-edit-text-" + id).val();
+	if(tmpStr == window.commentEmptyText) {
+		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);
 	}
-	/*else
-		tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
+	var ins = $(obj).html();
+	ins = ins.replace("&lt;","<");
+	ins = ins.replace("&gt;",">");
+	ins = ins.replace("&amp;","&");
+	ins = ins.replace("&quot;",'"');
+	$("#comment-edit-text-" + id).val(tmpStr + ins);
 }
 
-if(typeof window.geoTag === 'function') window.geoTag();
+function qCommentInsert(obj,id) {
+	var tmpStr = $("#comment-edit-text-" + id).val();
+	if(tmpStr == window.commentEmptyText) {
+		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;",'"');
+	$("#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();
+	}
+}*/
+
+
+function insertFormatting(comment,BBcode,id) {
+	
+	var tmpStr = $("#comment-edit-text-" + id).val();
+	if(tmpStr == comment) {
+		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);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		if (BBcode == "url"){
+			selected.text = "["+BBcode+"=http://]" +  selected.text + "[/"+BBcode+"]";
+			} 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
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+	}
+	return true;
+}
+
+function cmtBbOpen(id) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+}