| @@ -102,9 +102,9 @@ | ||
| 102 | 102 | |
| 103 | 103 | // Always show in admin bar and hidden in wp-admin. |
| 104 | 104 | if ( is_admin() ) { |
| 105 | 105 | $window['isHidden'] = true; |
| 106 | - $window['hiddenAppearance'] = 'admin_bar'; | |
| 106 | + // $window['hiddenAppearance'] = 'admin_bar'; | |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | $user_state['window'] = $window; |
| 110 | 110 | |
| @@ -139,13 +139,13 @@ | ||
| 139 | 139 | 'adminURLs' => $this->site->get_admin_urls(), |
| 140 | 140 | 'ajaxUrl' => admin_url( 'admin-ajax.php' ), |
| 141 | 141 | 'apiRoot' => esc_url_raw( get_rest_url() ), |
| 142 | 142 | 'attachmentTypes' => [ |
| 143 | - 'all' => __( 'All', 'fl-assistant' ), | |
| 144 | - 'image' => __( 'Photo', 'fl-assistant' ), | |
| 145 | - 'document' => __( 'Document', 'fl-assistant' ), | |
| 146 | - 'video' => __( 'Video', 'fl-assistant' ), | |
| 147 | - 'audio' => __( 'Audio', 'fl-assistant' ), | |
| 143 | + 'all' => __( 'All', 'assistant' ), | |
| 144 | + 'image' => __( 'Photo', 'assistant' ), | |
| 145 | + 'document' => __( 'Document', 'assistant' ), | |
| 146 | + 'video' => __( 'Video', 'assistant' ), | |
| 147 | + 'audio' => __( 'Audio', 'assistant' ), | |
| 148 | 148 | ], |
| 149 | 149 | 'contentTypes' => $this->posts->get_types(), |
| 150 | 150 | 'contentStatus' => $this->posts->get_stati(), |
| 151 | 151 | 'currentPageView' => $this->site->get_current_view(), |
| @@ -153,8 +153,9 @@ | ||
| 153 | 153 | 'defaultAppName' => 'fl-home', |
| 154 | 154 | 'emptyTrashDays' => EMPTY_TRASH_DAYS, |
| 155 | 155 | 'frameDefaults' => UserState::getFrameDefaults(), |
| 156 | 156 | 'homeUrl' => home_url(), |
| 157 | + 'baseUrl' => get_bloginfo( 'url' ), | |
| 157 | 158 | 'isShowingAdminBar' => is_admin_bar_showing(), |
| 158 | 159 | 'isAdmin' => is_admin(), |
| 159 | 160 | 'isSiteAdmin' => is_super_admin(), |
| 160 | 161 | 'isLocalhost' => $this->site->is_local(), |
| @@ -194,10 +195,10 @@ | ||
| 194 | 195 | if ( is_customize_preview() ) { |
| 195 | 196 | return false; |
| 196 | 197 | } |
| 197 | 198 | |
| 198 | - // Don't show in admin iframes. | |
| 199 | - if ( defined( 'IFRAME_REQUEST' ) && IFRAME_REQUEST ) { | |
| 199 | + // Don't show in iframes. | |
| 200 | + if ( defined( 'IFRAME_REQUEST' ) && IFRAME_REQUEST && ! isset( $_GET['fl_builder_ui'] ) ) { | |
| 200 | 201 | return false; |
| 201 | 202 | } |
| 202 | 203 | |
| 203 | 204 | // Don't show in post previews. |
| @@ -204,8 +205,13 @@ | ||
| 204 | 205 | if ( isset( $_GET['fl_asst_post_preview'] ) ) { |
| 205 | 206 | return false; |
| 206 | 207 | } |
| 207 | 208 | |
| 209 | + // Don't show in Oxygen. | |
| 210 | + if ( isset( $_GET['ct_builder'] ) ) { | |
| 211 | + return false; | |
| 212 | + } | |
| 213 | + | |
| 208 | 214 | // User is logged in, and the current request is not customizer or an iframe |
| 209 | 215 | $state = UserState::get(); |
| 210 | 216 | |
| 211 | 217 | // Don't show Assistant in the WP Admin if the user has turned it off. |
| @@ -217,9 +223,9 @@ | ||
| 217 | 223 | if ( ! current_user_can( 'edit_others_posts' ) ) { |
| 218 | 224 | return false; |
| 219 | 225 | } |
| 220 | 226 | |
| 221 | - return true; | |
| 227 | + return apply_filters( 'fl_assistant_should_enqueue', true ); | |
| 222 | 228 | } |
| 223 | 229 | |
| 224 | 230 | public function register_vendors() { |
| 225 | 231 | |
| @@ -318,10 +324,8 @@ | ||
| 318 | 324 | wp_localize_script( 'fl-assistant', 'FL_ASSISTANT_INITIAL_STATE', $state ); |
| 319 | 325 | |
| 320 | 326 | // Apps - loaded in footer |
| 321 | 327 | wp_enqueue_script( 'fl-assistant-apps', $url . 'build/apps.js', [ 'fl-assistant', 'html2canvas' ], $ver, true ); |
| 322 | - | |
| 323 | - // Currently don't need apps stylesheet | |
| 324 | 328 | //wp_enqueue_style( 'fl-assistant-apps', $url . 'build/apps.css', [ 'fl-assistant' ], $ver, null ); |
| 325 | 329 | |
| 326 | 330 | // Render - loaded in footer |
| 327 | 331 | wp_enqueue_script( 'fl-assistant-render', $url . 'build/render.js', [ 'fl-assistant' ], $ver, true ); |
