diff options
| author | Mario <mario@mariovavti.com> | 2019-11-28 09:30:57 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-11-28 09:30:57 +0100 |
| commit | f2c73c0f45787a361f9fd57831a00c34e660fbd9 (patch) | |
| tree | e99d7e74db23a916cba86a1527f6fcee82a0c2b3 | |
| parent | 78492d0037aacb829dd0cea13526f3631e8cf945 (diff) | |
| parent | c86b35da701674510a97ccc21e46581bd864cc31 (diff) | |
| download | volse-hubzilla-f2c73c0f45787a361f9fd57831a00c34e660fbd9.tar.gz volse-hubzilla-f2c73c0f45787a361f9fd57831a00c34e660fbd9.tar.bz2 volse-hubzilla-f2c73c0f45787a361f9fd57831a00c34e660fbd9.zip | |
Merge branch 'fix-listmode-spinner' into 'dev'
Move auto_save_draft to header from thread comment
See merge request hubzilla/core!1793
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Photos.php | 4 | ||||
| -rwxr-xr-x | boot.php | 3 | ||||
| -rwxr-xr-x | view/tpl/comment_item.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 1 |
5 files changed, 5 insertions, 11 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 0f59953dc..32cd52751 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -789,8 +789,6 @@ class ThreadItem { call_hooks('comment_buttons',$arr); $comment_buttons = $arr['comment_buttons']; - $feature_auto_save_draft = ((feature_enabled($conv->get_profile_owner(), 'auto_save_draft')) ? "true" : "false"); - $comment_box = replace_macros($template,array( '$return_path' => '', '$threaded' => $this->is_threaded(), @@ -825,8 +823,7 @@ class ThreadItem { '$anoncomments' => ((($conv->get_mode() === 'channel' || $conv->get_mode() === 'display') && perm_is_allowed($conv->get_profile_owner(),'','post_comments')) ? true : false), '$anonname' => [ 'anonname', t('Your full name (required)') ], '$anonmail' => [ 'anonmail', t('Your email address (required)') ], - '$anonurl' => [ 'anonurl', t('Your website URL (optional)') ], - '$auto_save_draft' => $feature_auto_save_draft + '$anonurl' => [ 'anonurl', t('Your website URL (optional)') ] )); return $comment_box; diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 13ec64ab9..43c9f86ee 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -1080,7 +1080,6 @@ class Photos extends \Zotlabs\Web\Controller { $comments = ''; if(! $r) { if($observer && ($can_post || $can_comment)) { - $feature_auto_save_draft = ((feature_enabled($owner_uid, 'auto_save_draft')) ? "true" : "false"); $commentbox = replace_macros($cmnt_tpl,array( '$return_path' => '', '$mode' => 'photos', @@ -1096,8 +1095,7 @@ class Photos extends \Zotlabs\Web\Controller { '$submit' => t('Submit'), '$preview' => t('Preview'), '$ww' => '', - '$feature_encrypt' => false, - '$auto_save_draft' => $feature_auto_save_draft + '$feature_encrypt' => false )); } } @@ -1205,7 +1205,8 @@ class App { '$linkrel' => head_get_links(), '$js_strings' => js_strings(), '$zid' => get_my_address(), - '$channel_id' => self::$profile['uid'] + '$channel_id' => self::$profile['uid'], + '$auto_save_draft' => ((feature_enabled(self::$profile['uid'], 'auto_save_draft')) ? "true" : "false") ] ) . self::$page['htmlhead']; diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 23594677c..3b51971ec 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -1,6 +1,3 @@ - <script> - var auto_save_draft = {{$auto_save_draft}}; - </script> {{if $threaded}} <div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;"> {{else}} diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 5f874426c..bd4cf3747 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -15,6 +15,7 @@ {{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}} {{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}} var preloadImages = {{$preload_images}}; + var auto_save_draft = {{$auto_save_draft}}; </script> |