Merge branch 'dev' into 'dev'

Dev sync

See merge request kostikov/core!2

6 files changed, 31 insertions, 23 deletions

diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
index bbe0ac7ee..83e756367 100755
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -2,6 +2,9 @@
 
 	var bParam_cmd = "{{$baseurl}}/update/{{$pgtype}}";
 
+	{{if $conv_mode}}
+	var conv_mode = '{{$conv_mode}}';
+	{{/if}}
 
 	var bParam_uid = {{$uid}};
 	var bParam_gid = {{$gid}};
@@ -18,7 +21,6 @@
 	var bParam_list = {{$list}};
 	var bParam_fh = {{$fh}};
 	var bParam_dm = {{$dm}};
-	var bParam_static = {{$static}};
 
 	var bParam_search = "{{$search}}";
 	var bParam_xchan = "{{$xchan}}";
@@ -42,7 +44,6 @@
 		if(bParam_cmax != (-1)) bCmd = bCmd + "&cmax=" + bParam_cmax;
 		if(bParam_gid != 0) { bCmd = bCmd + "&gid=" + bParam_gid; } else
 		if(bParam_cid != 0) { bCmd = bCmd + "&cid=" + bParam_cid; }
-		if(bParam_static != 0) { bCmd = bCmd + "&static=" + bParam_static; }
 		if(bParam_star != 0) bCmd = bCmd + "&star=" + bParam_star;
 		if(bParam_liked != 0) bCmd = bCmd + "&liked=" + bParam_liked;
 		if(bParam_conv!= 0) bCmd = bCmd + "&conv=" + bParam_conv;
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index d7eaefe7e..78601c40d 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -259,7 +259,7 @@
 		{{/foreach}}
 		{{/if}}
 		{{if $item.comment}}
-		<div class="p-2 wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" >
+		<div id="wall-item-comment-wrapper-{{$item.id}}" class="p-2 wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" >
 			{{$item.comment}}
 		</div>
 		{{/if}}
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 0d212e029..ecb30afd3 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -14,7 +14,7 @@
 	var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}};
 	var justifiedGalleryActive = false;
 	{{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}}
-	{{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}}
+	var channelId = {{if $channel_id}}{{$channel_id}}{{else}}false{{/if}};{{* Used in e.g. autocomplete *}}
 	var preloadImages = {{$preload_images}};
 	var auto_save_draft = {{$auto_save_draft}};
 </script>
diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl
index 4eb621f93..f814b374c 100644
--- a/view/tpl/item_filer.tpl
+++ b/view/tpl/item_filer.tpl
@@ -1,7 +1,7 @@
 {{if $categories}}
 <!--div class="filesavetags"-->
 {{foreach $categories as $cat}}
-<span class="item-category badge badge-pill badge-danger"><i class="fa fa-folder-o"></i>&nbsp;{{$cat.term}}&nbsp;<a href="{{$cat.removelink}}" class="text-white" title="{{$remove}}"><i class="fa fa-close"></i></a></span>
+<span class="item-category badge badge-pill badge-danger"><i class="fa fa-folder-o"></i>&nbsp;{{$cat.term}}&nbsp;<a href="{{$cat.removelink}}" class="text-white" title="{{$remove}}" onClick="itemFilerRm({{$cat.id}}, '{{$cat.term}}'); return false;"><i class="fa fa-close"></i></a></span>
 {{/foreach}}
 <!--/div-->
 {{/if}}
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index d519fd666..2539c1fdf 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -61,13 +61,11 @@ var activeCommentText = '';
 		$('#jot-add-option').on('click', jotAddOption);
 		$(document).on('click', '.poll-option-close', jotRemoveOption);
 
-		function jotSetMime() { 
-			var mtype = $('#id_mimetype').val(); 
-			if(mtype == 'text/bbcode')
-				$('#profile-jot-submit-left').show();
-			else
-				$('#profile-jot-submit-left').hide();
-		}
+		$('#profile-jot-form').keydown(function(e) {
+			if (e.ctrlKey && e.keyCode === 13) {
+				$(this).trigger('submit');
+			}
+		});
 
 		$('#invisible-wall-file-upload').fileupload({
 			url: 'wall_attach/{{$nickname}}',
@@ -91,11 +89,10 @@ var activeCommentText = '';
 		$('#wall-file-upload').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;});
 		$('#wall-file-upload-sub').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;});
 
-        // call initialization file
-        if (window.File && window.FileList && window.FileReader) {
-          DragDropUploadInit();
-        }
-
+		// call initialization file
+		if (window.File && window.FileList && window.FileReader) {
+			DragDropUploadInit();
+		}
 
 		$('#invisible-comment-upload').fileupload({
 			url: 'wall_attach/{{$nickname}}',
@@ -128,6 +125,14 @@ var activeCommentText = '';
 
 	});
 
+	function jotSetMime() { 
+		var mtype = $('#id_mimetype').val(); 
+		if(mtype == 'text/bbcode')
+			$('#profile-jot-submit-left').show();
+		else
+			$('#profile-jot-submit-left').hide();
+	}
+
 	function deleteCheckedItems() {
 		var checkedstr = '';
 
@@ -298,13 +303,9 @@ var activeCommentText = '';
 		if(reply && reply.length) {
 			reply = reply.replace('#','');
 			if(reply.length) {
-
 				commentBusy = true;
 				$('body').css('cursor', 'wait');
-
-				$.get('{{$baseurl}}/tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(updateInit,3000);
+				$.get('{{$baseurl}}/tagger/' + id + '?term=' + reply, updateInit);
 				liking = 1;
 			}
 		}
@@ -353,6 +354,13 @@ var activeCommentText = '';
 		
 	}
 
+	function itemFilerRm(id, term) {
+		commentBusy = true;
+		$('body').css('cursor', 'wait');
+		$.get('{{$baseurl}}/filerm/' + id + '?f=&term=' + term, updateInit);
+		liking = 1;
+	}
+
 	function itemBookmark(id) {
 		$.get('{{$baseurl}}/bookmarks?f=&item=' + id);
 		if(timer) clearTimeout(timer);
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index c93efb4aa..c2dd94175 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -63,7 +63,6 @@
 						{{include file="field_checkbox.tpl" field=$title_tosource}}
 						{{include file="field_checkbox.tpl" field=$user_scalable}}
 						{{include file="field_checkbox.tpl" field=$preload_images}}
-						{{include file="field_checkbox.tpl" field=$manual_update}}
 						{{include file="field_checkbox.tpl" field=$start_menu}}
 						<div class="settings-submit-wrapper" >
 							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>