harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #480, enable bbcode autocomplete for photo comments and remove some redundant javascript

Browse Source
This commit is contained in:
Mario Vavti 2016-08-13 22:17:47 +02:00
parent 2c8a82713e
commit e5d1dd111e
4 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
view/js/main.js
View File

@ -635,6 +635,7 @@ function updateConvItems(mode,data) {
$(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl?f=&n=1"); $(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
/* autocomplete bbcode */ /* autocomplete bbcode */
$(".comment-edit-form textarea").bbco_autocomplete('bbcode'); $(".comment-edit-form textarea").bbco_autocomplete('bbcode');
console.log('bla');
var bimgs = ((preloadImages) ? false : $(".wall-item-body img").not(function() { return this.complete; })); var bimgs = ((preloadImages) ? false : $(".wall-item-body img").not(function() { return this.complete; }));
var bimgcount = bimgs.length; var bimgcount = bimgs.length;

16
view/js/mod_photos.js
View File

@ -7,21 +7,7 @@ $(document).ready(function() {
$("#photo-edit-newtag").val('@' + data.name); $("#photo-edit-newtag").val('@' + data.name);
}); });
$('#id_body').bbco_autocomplete('bbcode'); $('textarea').bbco_autocomplete('bbcode');
$('#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('fa-unlock').addClass('fa-lock');
$('#jot-public').hide();
});
if(selstr === null) {
$('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('#jot-public').show();
}
}).trigger('change');
showHideBodyTextarea(); showHideBodyTextarea();
}); });

1
view/tpl/comment_item.tpl
View File

@ -71,3 +71,4 @@
<div class="clear"></div> <div class="clear"></div>
</form> </form>
</div> </div>
<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview"></div>

1
view/tpl/conv_item.tpl
View File

@ -225,7 +225,6 @@
<div class="wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" > <div class="wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" >
{{$item.comment}} {{$item.comment}}
</div> </div>
<div id="comment-edit-preview-{{$item.id}}" class="comment-edit-preview"></div>
<div class="clear"></div> <div class="clear"></div>
{{/if}} {{/if}}
</div> </div>