diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/mod_photos.js | 15 | ||||
| -rw-r--r-- | view/tpl/jot-header.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/photo_view.tpl | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js index af675e31c..41b8ed560 100644 --- a/view/js/mod_photos.js +++ b/view/js/mod_photos.js @@ -8,11 +8,12 @@ $(document).ready(function() { UploadInit(); } - $("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'a', false, function(data) { - $("#photo-edit-newtag").val('@' + data.name); - }); - + //$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'a', false, function(data) { + //$("#photo-edit-newtag").val('@' + data.name); + //}); + $(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl?f=&n=1"); + $('textarea').editor_autocomplete(baseurl+"/acl"); $('textarea').bbco_autocomplete('bbcode'); showHideBodyTextarea(); @@ -70,12 +71,12 @@ function UploadInit() { progress: function(e,data) { - // there will only be one file, the one we are looking for + // there will only be one file, the one we are looking for $(data.files).each( function() { var idx = this.count; - // Dynamically update the percentage complete displayed in the file upload list + // Dynamically update the percentage complete displayed in the file upload list $('#upload-progress-' + idx).html(Math.round(data.loaded / data.total * 100) + '%'); $('#upload-progress-bar-' + idx).css('background-size', Math.round(data.loaded / data.total * 100) + '%'); @@ -283,7 +284,7 @@ function UploadFile(file, idx) { $('#upload-progress-' + idx).html('<span style="color: red;">ERROR</span>'); }); - // POST to the entire cloud path + // POST to the entire cloud path xhr.open('post', $('#photos-upload-form').attr( 'action' ), true); var formfields = $("#photos-upload-form").serializeArray(); diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 2669f80cf..8da7b429d 100644 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -321,10 +321,8 @@ var activeCommentText = ''; postSaveChanges('clean'); {{if $popup}} - return; - {{/if}} - - {{if $reset}} + $("#profile-jot-text").focus(); + {{else if $reset}} $(".jothidden").hide(); $("#profile-jot-text").removeClass('jot-expanded'); $("#profile-jot-tools").addClass('d-none'); diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 6d566cab9..7698fb437 100644 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -66,10 +66,12 @@ <label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label> <input id="photo-edit-caption" class="form-control" type="text" name="desc" value="{{$edit.caption}}" /> </div> + {{* <div class="form-group"> <label id="photo-edit-tags-label" for="photo-edit-newtag">{{$edit.tag_label}}</label> <input name="newtag" id="photo-edit-newtag" class="form-control" title="{{$edit.help_tags}}" type="text" /> </div> + *}} <div class="form-group"> {{include file="field_select.tpl" field=$edit.album_select}} </div> |