| @@ -8,10 +8,8 @@ | ||
| 8 | 8 | use FL\Assistant\Data\Transformers\UserTransformer; |
| 9 | 9 | use FL\Assistant\Data\UserState; |
| 10 | 10 | use FL\Assistant\Data\Mockup; |
| 11 | 11 | use FL\Assistant\Services\ThemeService; |
| 12 | -use FL\Assistant\Helpers\BeaverBuilderHelper; | |
| 13 | -use FL\Assistant\System\Integrations\BeaverBuilder; | |
| 14 | 12 | use FLBuilderModel; |
| 15 | 13 | |
| 16 | 14 | /** |
| 17 | 15 | * Class OnEnqueueScripts |
| @@ -28,10 +26,8 @@ | ||
| 28 | 26 | * @var PostsRepository |
| 29 | 27 | */ |
| 30 | 28 | protected $posts; |
| 31 | 29 | |
| 32 | - protected $beaver_builder; | |
| 33 | - | |
| 34 | 30 | /** |
| 35 | 31 | * @var Site |
| 36 | 32 | */ |
| 37 | 33 | protected $site; |
| @@ -53,10 +49,9 @@ | ||
| 53 | 49 | public function __construct( |
| 54 | 50 | UsersRepository $users, |
| 55 | 51 | PostsRepository $posts, |
| 56 | 52 | Site $site, |
| 57 | - UserTransformer $user_transform, | |
| 58 | - BeaverBuilder $beaver_builder | |
| 53 | + UserTransformer $user_transform | |
| 59 | 54 | ) { |
| 60 | 55 | |
| 61 | 56 | $this->users = $users; |
| 62 | 57 | $this->posts = $posts; |
| @@ -61,11 +56,11 @@ | ||
| 61 | 56 | $this->users = $users; |
| 62 | 57 | $this->posts = $posts; |
| 63 | 58 | $this->site = $site; |
| 64 | 59 | $this->user_transform = $user_transform; |
| 65 | - $this->beaver_builder = $beaver_builder; | |
| 66 | 60 | } |
| 67 | 61 | |
| 62 | + | |
| 68 | 63 | /** |
| 69 | 64 | * @return array |
| 70 | 65 | * @throws \Exception |
| 71 | 66 | */ |
| @@ -163,9 +158,8 @@ | ||
| 163 | 158 | 'isShowingAdminBar' => is_admin_bar_showing(), |
| 164 | 159 | 'isAdmin' => is_admin(), |
| 165 | 160 | 'isSiteAdmin' => is_super_admin(), |
| 166 | 161 | 'isLocalhost' => $this->site->is_local(), |
| 167 | - 'isBBInstalled' => $this->beaver_builder->is_installed(), | |
| 168 | 162 | 'mockup' => Mockup::get(), |
| 169 | 163 | 'nonce' => [ |
| 170 | 164 | 'api' => wp_create_nonce( 'wp_rest' ), |
| 171 | 165 | 'reply' => wp_create_nonce( 'replyto-comment' ), |
| @@ -171,10 +165,8 @@ | ||
| 171 | 165 | 'reply' => wp_create_nonce( 'replyto-comment' ), |
| 172 | 166 | 'replyUnfiltered' => wp_create_nonce( 'unfiltered-html-comment' ), |
| 173 | 167 | 'updates' => wp_create_nonce( 'updates' ), |
| 174 | 168 | ], |
| 175 | - 'name' => 'Assistant Plugin', | |
| 176 | - 'version' => FL_ASSISTANT_VERSION, | |
| 177 | 169 | 'pluginURL' => FL_ASSISTANT_URL, |
| 178 | 170 | 'taxonomies' => $this->posts->get_taxononies(), |
| 179 | 171 | 'userRoles' => $this->users->get_roles(), |
| 180 | 172 | 'cloudConfig' => [ |
| @@ -183,9 +175,8 @@ | ||
| 183 | 175 | 'pusherKey' => FL_ASSISTANT_PUSHER_KEY, |
| 184 | 176 | 'pusherCluster' => FL_ASSISTANT_PUSHER_CLUSTER, |
| 185 | 177 | ], |
| 186 | 178 | 'embedInBB' => FL_ASST_SUPPORTS_BB, |
| 187 | - 'isBBExtension' => BeaverBuilderHelper::is_assistant_extension(), | |
| 188 | 179 | 'themeSlug' => $theme['slug'], |
| 189 | 180 | 'themeParentSlug' => $theme['parent'] ? $theme['parent']['slug'] : null, |
| 190 | 181 | ]; |
| 191 | 182 | } |
| @@ -194,13 +185,8 @@ | ||
| 194 | 185 | * Check if the frontend scripts/styles should be enqueued |
| 195 | 186 | */ |
| 196 | 187 | public function should_enqueue() { |
| 197 | 188 | |
| 198 | - // Don't enqueue outside of BB if in extension mode. | |
| 199 | - if ( BeaverBuilderHelper::is_assistant_extension() && class_exists( 'FLBuilder' ) && ! FLBuilderModel::is_builder_active() ) { | |
| 200 | - return false; | |
| 201 | - } | |
| 202 | - | |
| 203 | 189 | // Users must be logged in. |
| 204 | 190 | if ( ! is_user_logged_in() ) { |
| 205 | 191 | return false; |
| 206 | 192 | } |
| @@ -337,10 +323,10 @@ | ||
| 337 | 323 | wp_localize_script( 'fl-assistant', 'FL_ASSISTANT_CONFIG', $config ); |
| 338 | 324 | wp_localize_script( 'fl-assistant', 'FL_ASSISTANT_INITIAL_STATE', $state ); |
| 339 | 325 | |
| 340 | 326 | // Apps - loaded in footer |
| 341 | - $apps = BeaverBuilderHelper::is_assistant_extension() ? 'apps-cloud.js' : 'apps.js'; | |
| 342 | - wp_enqueue_script( 'fl-assistant-apps', $url . "build/$apps", [ 'fl-assistant', 'html2canvas' ], $ver, true ); | |
| 327 | + wp_enqueue_script( 'fl-assistant-apps', $url . 'build/apps.js', [ 'fl-assistant', 'html2canvas' ], $ver, true ); | |
| 328 | + //wp_enqueue_style( 'fl-assistant-apps', $url . 'build/apps.css', [ 'fl-assistant' ], $ver, null ); | |
| 343 | 329 | |
| 344 | 330 | // Render - loaded in footer |
| 345 | 331 | wp_enqueue_script( 'fl-assistant-render', $url . 'build/render.js', [ 'fl-assistant' ], $ver, true ); |
| 346 | 332 | wp_enqueue_style( 'fl-assistant-render', $url . 'build/render.css', [ 'fl-assistant' ], $ver, null ); |
