Merge pull request #4044 from Codeinwp/feat/remove_builder_migration

feat: removed style and builder rollback #3952
Codeinwp · Sep 15, 2023 · a852eb8 · a852eb8
2 parents 4b74936 + 7a4a630
commit a852eb8
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 452 deletions.
diff --git a/assets/apps/customizer-controls/src/builder-instructions/HFGMigrationNotice.tsx b/assets/apps/customizer-controls/src/builder-instructions/HFGMigrationNotice.tsx
diff --git a/assets/apps/customizer-controls/src/builder-instructions/Instructions.tsx b/assets/apps/customizer-controls/src/builder-instructions/Instructions.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { __ } from '@wordpress/i18n';
 import { Button } from '@wordpress/components';
 import { WPCustomizeControl } from '../@types/customizer-control';
-import { HFGMigrationNotice } from './HFGMigrationNotice';
 
 type Props = {
 	control: WPCustomizeControl;
@@ -72,12 +71,6 @@ const Instructions: React.FC<Props> = ({ control }) => {
 							);
 						})}
 					</ul>
-					{id === 'hfg_header_layout_section_quick_links' && (
-						<HFGMigrationNotice
-							hadOldBuilder={hadOldBuilder}
-							alreadyMigrated={builderMigrated}
-						/>
-					)}
 				</div>
 			)}
 		</div>

diff --git a/assets/apps/customizer-controls/src/controls.js b/assets/apps/customizer-controls/src/controls.js
@@ -29,7 +29,6 @@ import { BuilderColumns } from './builder-columns/Control';
 import { TextareaControl } from './textarea/Control';
 import { InstructionsControl } from './builder-instructions/Control';
 import { HeadingControl } from './heading/Control';
-import { SkinSwitcherControl } from './skin-switcher/Control';
 import { LogoPaletteControl } from './logo-palette/Control';
 import { RepeaterControl } from './repeater/Control';
 import { RichTextControl } from './rich-text/Control';
@@ -77,7 +76,6 @@ controlConstructor.neve_builder_columns = BuilderColumns;
 controlConstructor.neve_textarea = TextareaControl;
 controlConstructor.hfg_instructions = InstructionsControl;
 controlConstructor.neve_customizer_heading = HeadingControl;
-controlConstructor.neve_skin_switcher = SkinSwitcherControl;
 controlConstructor.neve_logo_palette_control = LogoPaletteControl;
 controlConstructor.neve_repeater_control = RepeaterControl;
 controlConstructor.neve_rich_text = RichTextControl;

diff --git a/assets/apps/customizer-controls/src/skin-switcher/Control.js b/assets/apps/customizer-controls/src/skin-switcher/Control.js
diff --git a/assets/apps/customizer-controls/src/skin-switcher/SkinSwitcher.tsx b/assets/apps/customizer-controls/src/skin-switcher/SkinSwitcher.tsx
diff --git a/header-footer-grid/Core/Builder/Header.php b/header-footer-grid/Core/Builder/Header.php
@@ -94,7 +94,6 @@ public function init() {
 					),
 				),
 				'builderMigrated' => $migrated_hfg,
-				'hadOldBuilder'   => neve_had_old_hfb() && ( ! neve_is_new_skin() || neve_was_auto_migrated_to_new() ),
 			)
 		);
-Original file line number
+Diff line change
@@ Expand Up / @@ -94,7 +94,6 @@ public function init() { @@
     					),
     				),
     				'builderMigrated' => $migrated_hfg,
-    				'hadOldBuilder'   => neve_had_old_hfb() && ( ! neve_is_new_skin() || neve_was_auto_migrated_to_new() ),
     			)
     		);
@@ Expand Down @@