Enable status button if current theme is not active. #132

mohdsayed · 2017-03-11T07:16:20Z

Fixes #131

mohdsayed · 2017-03-11T07:21:27Z

@westonruter We have a param theme=twentyfifteen in url when we switch theme, I think that should also be saved in changeset like we saved the history query params in the other PR?

westonruter · 2017-03-11T18:39:58Z

@sayedtaqui oh yes, absolutely! That param can be included in the customizer state query params only when saving a changeset for a theme that is not active. If the theme is active, then the param should be omitted from being saved.

coveralls · 2017-03-13T12:53:57Z

Coverage decreased (-0.03%) to 76.537% when pulling 023a0a6 on bugfix/issue-131 into c7b9124 on develop.

coveralls · 2017-03-13T14:06:46Z

Coverage decreased (-0.03%) to 76.537% when pulling a372282 on bugfix/issue-131 into c7b9124 on develop.

…tch back to the original theme.

coveralls · 2017-03-13T16:24:40Z

Coverage decreased (-0.1%) to 76.431% when pulling c71add1 on bugfix/issue-131 into c7b9124 on develop.

coveralls · 2017-03-14T12:04:35Z

Coverage decreased (-0.1%) to 76.431% when pulling 58f0ce9 on bugfix/issue-131 into c7b9124 on develop.

westonruter · 2017-03-14T20:53:37Z

Is this out of WIP and ready for review?

westonruter · 2017-03-14T20:54:49Z

js/customize-snapshots.js

 			queryVars.scroll = parseInt( api.previewer.scroll, 10 ) || 0;
 			queryVars.device = api.previewedDevice.get();
 			queryVars.url = api.previewer.previewUrl.get();

+			if ( ! api.state( 'activated' ).get() || snapshot.data.theme !== currentTheme ) {
+				queryVars.previewingTheme = true;


Since this is going to be sent with the POST request, I think it should be previewing_theme instead. Then below in PHP, you'd read $query_vars['previewing_theme'].

westonruter · 2017-03-14T20:55:12Z

php/class-post-type.php

+
+		if ( isset( $preview_url_query_vars['theme'] ) && $current_theme !== $preview_url_query_vars['theme'] ) {
+			$args = array_merge( $args, array(
+					'theme' => $preview_url_query_vars['theme'],


Extra tab here?

mohdsayed · 2017-03-15T06:56:20Z

Not ready yet, need to test and may be few changes. Trying to finish today.

coveralls · 2017-03-15T13:16:13Z

Coverage decreased (-0.2%) to 76.388% when pulling cc2f54d on bugfix/issue-131 into c7b9124 on develop.

coveralls · 2017-03-15T13:58:37Z

Coverage decreased (-0.2%) to 76.388% when pulling 26f7316 on bugfix/issue-131 into c7b9124 on develop.

mohdsayed · 2017-03-15T13:59:17Z

Ready for review.

…e_active

westonruter · 2017-03-16T06:10:23Z

js/customize-snapshots.js

@@ -255,6 +266,7 @@
 					dialogElement;

 				snapshot.statusButton.disableSelect.set( false );
+				snapshot.statusButton.disbleButton.set( false );


I'm glad you caught this. It's something I was noticing in the case of setting validation errors, where I'd get a validation error message with a control but the Publish button would remain disabled.

coveralls · 2017-03-16T06:17:02Z

Coverage decreased (-26.3%) to 50.233% when pulling 2559457 on bugfix/issue-131 into c7b9124 on develop.

…ches The 'customize_theme' param is used on the frontend, whereas just 'theme' is used in the admin.

westonruter · 2017-03-16T06:32:42Z

@sayedtaqui the one remaining issue I see, and this isn't strictly related to the changes here, but when I publish the changeset the frontend preview link continues to have the customize_changeset_uuid even though it is published:

coveralls · 2017-03-16T06:38:05Z

Coverage decreased (-26.3%) to 50.233% when pulling 9ca3ff2 on bugfix/issue-131 into c7b9124 on develop.

mohdsayed · 2017-03-21T06:46:03Z

php/class-customize-snapshot-manager-back-compat.php

@@ -106,7 +101,7 @@ public function enqueue_controls_scripts() {
 			'initialServerDate' => current_time( 'mysql', false ),
 			'initialServerTimestamp' => floor( microtime( true ) * 1000 ),
 			'theme' => $this->original_stylesheet,
-			'previewingTheme' => isset( $preview_url_query_vars['theme'] ) ? $preview_url_query_vars['theme']: '',
+			'previewingTheme' => ! $this->customize_manager->is_theme_active(),


@westonruter This is breaking my condition here

wp-customize-snapshots/js/compat/customize-snapshots.js

Line 278 in 9ca3ff2

snapshot.isNotSavedPreviewingTheme = savedPreviewingTheme && savedPreviewingTheme !== currentTheme;

There are several use cases where the button has to be enabled or disabled.

When they switch theme ( Has to enable ) ( Working )

After saving the previewing theme, reload the page, ( Has to disable ) ( Not working now )

After saving the previewing theme they switch to a third theme ( Has to enable ) ( Working )

After travelling through the themes and saving the last one, they come back to the original theme ( Should be enable ) ( Not working now ).

I was not able to satisfy these conditions with only boolean value of previewingTheme . This is as good as api.state( 'activated' ).get()

Thanks for pointing this out. So this can be fixed by reverting back to:

'previewingTheme' => isset( $preview_url_query_vars['theme'] ) ? $preview_url_query_vars['theme'] : '',

?

coveralls · 2017-03-21T08:12:47Z

Coverage decreased (-26.3%) to 50.233% when pulling a71adbb on bugfix/issue-131 into c7b9124 on develop.

mohdsayed · 2017-03-21T16:02:35Z

php/class-customize-snapshot-manager.php

@@ -225,7 +226,7 @@ public function add_snapshot_uuid_to_return_url() {
 			&&
 			$this->current_snapshot_uuid
 			&&
-			$this->is_theme_active()
+			$this->customize_manager->is_theme_active()
 			&&


@westonruter Not sure why $this->customize_manager->is_theme_active() is returning false in 4.6.1 which is failing phpunit test. I mean inside phpunit test.

It's because the setup_theme action wasn't triggered in the test case, and so \WP_Customize_Manager::$original_stylesheet didn't get set. In 4.7 this variable gets set in \WP_Customize_Manager::__construct() whereas in 4.6 it got set in \WP_Customize_Manager::setup_theme().

Should be fixed in 52694b6.

coveralls · 2017-03-21T16:02:58Z

Coverage decreased (-26.4%) to 50.175% when pulling eb003e3 on bugfix/issue-131 into c7b9124 on develop.

…:$original_stylesheet will be set

coveralls · 2017-03-21T20:37:17Z

Coverage decreased (-26.4%) to 50.175% when pulling 52694b6 on bugfix/issue-131 into c7b9124 on develop.

Enable status button if current theme is not active.

e696e8f

westonruter added this to the 0.6.0 milestone Mar 11, 2017

mohdsayed added 2 commits March 13, 2017 17:45

Ensure that api.previewer.query is extended properly and only once.

80fe277

Save previewing theme with customizer state query params.

023a0a6

Enable update button for 4.6.x when theme is not active

a372282

Add current theme to preview link and enable save button when you swi…

c71add1

…tch back to the original theme.

Enable status button when ajax request fails.

58f0ce9

westonruter suggested changes Mar 14, 2017

View reviewed changes

mohdsayed added 2 commits March 15, 2017 13:52

Improve disable status button logic and review feedback.

7a6330a

Fix condition for enabling status button when changing themes.

cc2f54d

Update save button disable condition for 4.6.x when theme is changed.

26f7316

mohdsayed changed the title ~~[WIP]Enable status button if current theme is not active.~~ Enable status button if current theme is not active. Mar 15, 2017

westonruter added 2 commits March 15, 2017 23:04

Ensure snapshots can load for previewing theme switch; re-use is_them…

d43b570

…e_active

Fix casting of booleans and numbers to strings in PHP exports to JS

2559457

westonruter reviewed Mar 16, 2017

View reviewed changes

Ensure frontend preview link gets customize_theme param in theme swit…

9ca3ff2

…ches The 'customize_theme' param is used on the frontend, whereas just 'theme' is used in the admin.

mohdsayed commented Mar 21, 2017

View reviewed changes

Remove uuid from preview link after publish

a71adbb

Revert the previewingTheme value.

eb003e3

mohdsayed commented Mar 21, 2017

View reviewed changes

Ensure setup_theme is triggered in test so that WP_Customize_Manager:…

52694b6

…:$original_stylesheet will be set

westonruter approved these changes Mar 21, 2017

View reviewed changes

westonruter merged commit a255424 into develop Mar 21, 2017

westonruter deleted the bugfix/issue-131 branch March 21, 2017 20:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable status button if current theme is not active. #132

Enable status button if current theme is not active. #132

mohdsayed commented Mar 11, 2017 •

edited

Loading

mohdsayed commented Mar 11, 2017

westonruter commented Mar 11, 2017

coveralls commented Mar 13, 2017 •

edited

Loading

coveralls commented Mar 13, 2017 •

edited

Loading

coveralls commented Mar 13, 2017 •

edited

Loading

coveralls commented Mar 14, 2017 •

edited

Loading

westonruter commented Mar 14, 2017

westonruter Mar 14, 2017

westonruter Mar 14, 2017

mohdsayed commented Mar 15, 2017

coveralls commented Mar 15, 2017 •

edited

Loading

coveralls commented Mar 15, 2017 •

edited

Loading

mohdsayed commented Mar 15, 2017

westonruter Mar 16, 2017

coveralls commented Mar 16, 2017 •

edited

Loading

westonruter commented Mar 16, 2017

coveralls commented Mar 16, 2017 •

edited

Loading

mohdsayed Mar 21, 2017 •

edited

Loading

westonruter Mar 21, 2017

mohdsayed Mar 21, 2017

coveralls commented Mar 21, 2017

mohdsayed Mar 21, 2017 •

edited

Loading

westonruter Mar 21, 2017

westonruter Mar 21, 2017

coveralls commented Mar 21, 2017

coveralls commented Mar 21, 2017

Enable status button if current theme is not active. #132

Enable status button if current theme is not active. #132

Conversation

mohdsayed commented Mar 11, 2017 • edited Loading

mohdsayed commented Mar 11, 2017

westonruter commented Mar 11, 2017

coveralls commented Mar 13, 2017 • edited Loading

coveralls commented Mar 13, 2017 • edited Loading

coveralls commented Mar 13, 2017 • edited Loading

coveralls commented Mar 14, 2017 • edited Loading

westonruter commented Mar 14, 2017

westonruter Mar 14, 2017

Choose a reason for hiding this comment

westonruter Mar 14, 2017

Choose a reason for hiding this comment

mohdsayed commented Mar 15, 2017

coveralls commented Mar 15, 2017 • edited Loading

coveralls commented Mar 15, 2017 • edited Loading

mohdsayed commented Mar 15, 2017

westonruter Mar 16, 2017

Choose a reason for hiding this comment

coveralls commented Mar 16, 2017 • edited Loading

westonruter commented Mar 16, 2017

coveralls commented Mar 16, 2017 • edited Loading

mohdsayed Mar 21, 2017 • edited Loading

Choose a reason for hiding this comment

westonruter Mar 21, 2017

Choose a reason for hiding this comment

mohdsayed Mar 21, 2017

Choose a reason for hiding this comment

coveralls commented Mar 21, 2017

mohdsayed Mar 21, 2017 • edited Loading

Choose a reason for hiding this comment

westonruter Mar 21, 2017

Choose a reason for hiding this comment

westonruter Mar 21, 2017

Choose a reason for hiding this comment

coveralls commented Mar 21, 2017

coveralls commented Mar 21, 2017

mohdsayed commented Mar 11, 2017 •

edited

Loading

coveralls commented Mar 13, 2017 •

edited

Loading

coveralls commented Mar 13, 2017 •

edited

Loading

coveralls commented Mar 13, 2017 •

edited

Loading

coveralls commented Mar 14, 2017 •

edited

Loading

coveralls commented Mar 15, 2017 •

edited

Loading

coveralls commented Mar 15, 2017 •

edited

Loading

coveralls commented Mar 16, 2017 •

edited

Loading

coveralls commented Mar 16, 2017 •

edited

Loading

mohdsayed Mar 21, 2017 •

edited

Loading

mohdsayed Mar 21, 2017 •

edited

Loading