X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftheme%2Ffrio%2Ftemplates%2Fjot-header.tpl;h=ac59caed8e16dd18ff32052ce925088d41caed70;hb=4facd1dfdba93ede48ca40b5e146424e6701118b;hp=d52f4b98dec41eac862d5ce3ebff8c0c937166f0;hpb=42cc8d729b946f5058e5dcf4a74d86e898ed8f44;p=friendica.git

diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl
index d52f4b98de..ac59caed8e 100644
--- a/view/theme/frio/templates/jot-header.tpl
+++ b/view/theme/frio/templates/jot-header.tpl
@@ -1,5 +1,7 @@
 
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/linkPreview.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frio/js/jot.js"></script>
 
 <script type="text/javascript">
 	var editor = false;
@@ -39,6 +41,7 @@
 
 <script type="text/javascript">
 	var ispublic = '{{$ispublic}}';
+	aStr.linkurl = '{{$linkurl}}';
 
 
 	$(document).ready(function() {
@@ -126,18 +129,6 @@
 		}
 	}
 
-	function jotGetLink() {
-		reply = prompt("{{$linkurl}}");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
 	function jotVideoURL() {
 		reply = prompt("{{$vidurl}}");
 		if(reply && reply.length) {
@@ -152,7 +143,6 @@
 		}
 	}
 
-
 	function jotGetLocation() {
 		reply = prompt("{{$whereareu}}", $('#jot-location').val());
 		if(reply && reply.length) {
@@ -174,26 +164,31 @@
 		$("#jot-popup").show();
 	}
 
-	function linkdropper(event) {
+	function linkDropper(event) {
 		var linkFound = event.dataTransfer.types.contains("text/uri-list");
 		if(linkFound)
 			event.preventDefault();
 	}
 
-	function linkdrop(event) {
+	function linkDrop(event) {
 		var reply = event.dataTransfer.getData("text/uri-list");
+		var noAttachment = '';
 		event.target.textContent = reply;
 		event.preventDefault();
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
+			if (currentText.includes("[attachment") && currentText.includes("[/attachment]")) {
+				noAttachment = '&noAttachment=1';
+			}
+			$.get('parse_url?binurl=' + reply + noAttachment, function(data) {
 				if (!editor) $("#profile-jot-text").val("");
 				initEditor(function(){
 					addeditortext(data);
 					$('#profile-rotator').hide();
 				});
 			});
+			autosize.update($("#profile-jot-text"));
 		}
 	}
 
@@ -215,7 +210,6 @@
 	}
 
 	function itemFiler(id) {
-
 		var bordercolor = $("input").css("border-color");
 
 		$.get('filer/', function(data){
@@ -261,9 +255,10 @@
 		var currentText = $("#profile-jot-text").val();
 		//insert the data as new value
 		textfield.value = currentText + data;
+		autosize.update($("#profile-jot-text"));
 	}
 
-	{{$geotag}}
+	{{$geotag nofilter}}
 
 	function jotShow() {
 		var modal = $('#jot-modal').modal();
@@ -278,6 +273,9 @@
 			.find('#jot-modal-content')
 			.append(jotcache)
 			.modal.show;
+
+		// Jot attachment live preview.
+		linkPreview = $('#profile-jot-text').linkPreview();
 	}
 
 	// Activate the jot text section in the jot modal