WPtouch - Version 4.1.8

Version Description

Download this release

Release Info

Developer bravenewcode
Plugin Icon 128x128 WPtouch
Version 4.1.8
Comparing to
See all releases

Code changes from version 4.1.7 to 4.1.8

Files changed (12) hide show
  1. admin/js/wptouch-admin-4.js +2 -1
  2. admin/settings/html/theme-browser-item-detail.php +1 -1
  3. core/class-wptouch-pro.php +1 -1
  4. lang/wptouch-pro-es_ES.mo +0 -0
  5. lang/wptouch.pot +4 -4
  6. readme.txt +6 -1
  7. themes/bauhaus/default/search.php +8 -2
  8. themes/bauhaus/readme.txt +6 -1
  9. themes/bauhaus/root-functions.php +1 -1
  10. themes/foundation/default/style.css +2 -2
  11. themes/foundation/modules/load-more/load-more.js +22 -3
  12. wptouch.php +2 -2
admin/js/wptouch-admin-4.js CHANGED
@@ -959,8 +959,9 @@ function wptouchPreviewWindow(){
959
  previewCounter++;
960
  jQuery.cookie( 'wptouch-preview-count', previewCounter );
961
 
962
- if ( jQuery.cookie( 'wptouch-preview-count' ) == 5 || jQuery.cookie( 'wptouch-preview-count' ) %25 == 0 ) {
963
  showCustomizerWindow();
 
964
  } else {
965
  showPreviewWindow();
966
  }
959
  previewCounter++;
960
  jQuery.cookie( 'wptouch-preview-count', previewCounter );
961
 
962
+ if ( jQuery.cookie( 'wptouch-preview-count' ) == 5 || jQuery.cookie( 'wptouch-preview-count' ) %20 == 0 ) {
963
  showCustomizerWindow();
964
+ showPreviewWindow();
965
  } else {
966
  showPreviewWindow();
967
  }
admin/settings/html/theme-browser-item-detail.php CHANGED
@@ -31,7 +31,7 @@
31
  <?php if ( !is_network_admin() || wptouch_is_controlled_network() ) { ?>
32
  <div class="action-buttons<?php if ( !wptouch_can_cloud_install() && wptouch_is_theme_in_cloud() ) { ?> no-install<?php } ?>">
33
 
34
- <?php if ( wptouch_is_theme_active() && current_user_can( 'manage_options' ) && !is_network_admin() ) { ?>
35
  <a class="button" href="<?php echo admin_url( 'customize.php' ); ?>"><?php _e( 'Customize', 'wptouch-pro' ); ?></a>
36
  <?php } ?>
37
 
31
  <?php if ( !is_network_admin() || wptouch_is_controlled_network() ) { ?>
32
  <div class="action-buttons<?php if ( !wptouch_can_cloud_install() && wptouch_is_theme_in_cloud() ) { ?> no-install<?php } ?>">
33
 
34
+ <?php if ( !defined( 'WPTOUCH_IS_FREE' ) && wptouch_is_theme_active() && current_user_can( 'manage_options' ) && !is_network_admin() ) { ?>
35
  <a class="button" href="<?php echo admin_url( 'customize.php' ); ?>"><?php _e( 'Customize', 'wptouch-pro' ); ?></a>
36
  <?php } ?>
37
 
core/class-wptouch-pro.php CHANGED
@@ -2578,7 +2578,7 @@ class WPtouchProFour {
2578
  $settings_defaults = $settings;
2579
 
2580
  // merge settings
2581
- switch_to_blog( $current_blog_id );
2582
  }
2583
  }
2584
  }
2578
  $settings_defaults = $settings;
2579
 
2580
  // merge settings
2581
+ restore_current_blog();
2582
  }
2583
  }
2584
  }
lang/wptouch-pro-es_ES.mo CHANGED
Binary file
lang/wptouch.pot CHANGED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the WPtouch Mobile Plugin package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: WPtouch Mobile Plugin 4.1.7\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/wptouch\n"
7
- "POT-Creation-Date: 2016-07-05 19:37:14+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -1744,11 +1744,11 @@ msgstr ""
1744
  msgid "Show %s Results"
1745
  msgstr ""
1746
 
1747
- #: themes/bauhaus/default/search.php:52 themes/bauhaus/default/search.php:69
1748
  msgid "No results found"
1749
  msgstr ""
1750
 
1751
- #: themes/bauhaus/default/search.php:60
1752
  #: themes/foundation/default/search.php:43
1753
  msgid "Load more %s results"
1754
  msgstr ""
2
  # This file is distributed under the same license as the WPtouch Mobile Plugin package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: WPtouch Mobile Plugin 4.1.8\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/wptouch\n"
7
+ "POT-Creation-Date: 2016-07-19 20:39:26+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
1744
  msgid "Show %s Results"
1745
  msgstr ""
1746
 
1747
+ #: themes/bauhaus/default/search.php:52 themes/bauhaus/default/search.php:75
1748
  msgid "No results found"
1749
  msgstr ""
1750
 
1751
+ #: themes/bauhaus/default/search.php:66
1752
  #: themes/foundation/default/search.php:43
1753
  msgid "Load more %s results"
1754
  msgstr ""
readme.txt CHANGED
@@ -2,7 +2,7 @@
2
  Contributors: bravenewcode, duanestorey, dalemugford, mkuplens
3
  Tags: wptouch, iphone, ipod, bravenewcode, mobile, mobile-friendly, android, blackberry, smartphone, responsive, design, mobile plugin, ios, mobile theme
4
  Requires at least: 4.2
5
- Stable tag: 4.1.7
6
  Tested up to: 4.5.3
7
  License: GPLv2
8
 
@@ -33,6 +33,11 @@ For more information visit [WPtouch.com](http://www.wptouch.com/?utm_campaign=wp
33
 
34
  == Changelog ==
35
 
 
 
 
 
 
36
  = Version 4.1.7 (July 5, 2016) =
37
 
38
  * Fixed: Display issues with RTL menus and some themes
2
  Contributors: bravenewcode, duanestorey, dalemugford, mkuplens
3
  Tags: wptouch, iphone, ipod, bravenewcode, mobile, mobile-friendly, android, blackberry, smartphone, responsive, design, mobile plugin, ios, mobile theme
4
  Requires at least: 4.2
5
+ Stable tag: 4.1.8
6
  Tested up to: 4.5.3
7
  License: GPLv2
8
 
33
 
34
  == Changelog ==
35
 
36
+ = Version 4.1.8 (July 19, 2016) =
37
+
38
+ * Updated: Spanish translations
39
+ * Fixed: Search behaviour in some languages
40
+
41
  = Version 4.1.7 (July 5, 2016) =
42
 
43
  * Fixed: Display issues with RTL menus and some themes
themes/bauhaus/default/search.php CHANGED
@@ -56,7 +56,13 @@
56
  <?php } ?>
57
 
58
  <?php if ( get_next_posts_link() ) { ?>
59
- <a class="load-more-<?php echo str_replace( ' ', '-', strtolower( wptouch_fdn_get_search_post_type() ) ); ?>-link no-ajax" href="javascript:return false;" rel="<?php echo get_next_posts_page_link(); ?>">
 
 
 
 
 
 
60
  <?php echo strtolower( sprintf( __( "Load more %s results", 'wptouch-pro' ), wptouch_fdn_get_search_post_type() ) ); ?>&hellip;
61
  </a>
62
  <?php } ?>
@@ -72,4 +78,4 @@
72
 
73
  </div> <!-- content -->
74
 
75
- <?php get_footer(); ?>
56
  <?php } ?>
57
 
58
  <?php if ( get_next_posts_link() ) { ?>
59
+ <?php
60
+ if ( in_array( strtolower( $search_post_type ), array( 'post', 'page' ) ) ) {
61
+ $classes = 'load-more-' . strtolower( $search_post_type ). '-link';
62
+ } else {
63
+ $classes = 'load-more-custom-link';
64
+ } ?>
65
+ <a class="<?php echo $classes; ?> no-ajax" href="javascript:return false;" rel="<?php echo get_next_posts_page_link(); ?>" data-lang-type="<?php echo str_replace( ' ', '-', strtolower( wptouch_fdn_get_search_post_type() ) ); ?>">
66
  <?php echo strtolower( sprintf( __( "Load more %s results", 'wptouch-pro' ), wptouch_fdn_get_search_post_type() ) ); ?>&hellip;
67
  </a>
68
  <?php } ?>
78
 
79
  </div> <!-- content -->
80
 
81
+ <?php get_footer(); ?>
themes/bauhaus/readme.txt CHANGED
@@ -2,7 +2,7 @@ Theme Name: Bauhaus
2
  Theme URI: http://www.wptouch.com/themes/bauhaus
3
  Author: BraveNewCode Inc.
4
  Description: Clean, modern, functional design. Great for all types of WordPress sites.
5
- Version: 1.6.9
6
  Depends on: 4.1.6
7
  Framework: 2.0
8
  Tags: smartphone
@@ -23,6 +23,11 @@ Bauhaus is one of our more flexible themes, and is designed to easily take on th
23
 
24
  == Changelog ==
25
 
 
 
 
 
 
26
  = Version 1.6.9 =
27
 
28
  * Changed: Replaced library used for off-canvas menu (now using Slideout.js)
2
  Theme URI: http://www.wptouch.com/themes/bauhaus
3
  Author: BraveNewCode Inc.
4
  Description: Clean, modern, functional design. Great for all types of WordPress sites.
5
+ Version: 1.6.10
6
  Depends on: 4.1.6
7
  Framework: 2.0
8
  Tags: smartphone
23
 
24
  == Changelog ==
25
 
26
+ = Version 1.6.10 =
27
+
28
+ * Fixed: Search behaviour in some languages
29
+ * Fixed: Search behaviour for custom post types
30
+
31
  = Version 1.6.9 =
32
 
33
  * Changed: Replaced library used for off-canvas menu (now using Slideout.js)
themes/bauhaus/root-functions.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
 
3
- define( 'BAUHAUS_THEME_VERSION', '1.6.9' );
4
  define( 'BAUHAUS_SETTING_DOMAIN', 'bauhaus' );
5
  define( 'BAUHAUS_DIR', wptouch_get_bloginfo( 'theme_root_directory' ) );
6
  define( 'BAUHAUS_URL', wptouch_get_bloginfo( 'theme_parent_url' ) );
1
  <?php
2
 
3
+ define( 'BAUHAUS_THEME_VERSION', '1.6.10' );
4
  define( 'BAUHAUS_SETTING_DOMAIN', 'bauhaus' );
5
  define( 'BAUHAUS_DIR', wptouch_get_bloginfo( 'theme_root_directory' ) );
6
  define( 'BAUHAUS_URL', wptouch_get_bloginfo( 'theme_parent_url' ) );
themes/foundation/default/style.css CHANGED
@@ -415,7 +415,7 @@ to {
415
 
416
  /* @group Load More, Infinite */
417
 
418
- .load-more-link, .infinite-link, .load-more-comments-wrap, .load-more-post-link, .load-more-page-link {
419
  display: block;
420
  width: 100%;
421
  text-align: center;
@@ -1464,4 +1464,4 @@ span.wpcf7-form-control-wrap {
1464
  .table-parent {
1465
  max-width: 100%;
1466
  overflow: scroll;
1467
- }
415
 
416
  /* @group Load More, Infinite */
417
 
418
+ .load-more-link, .infinite-link, .load-more-comments-wrap, .load-more-post-link, .load-more-page-link, .load-more-custom-link {
419
  display: block;
420
  width: 100%;
421
  text-align: center;
1464
  .table-parent {
1465
  max-width: 100%;
1466
  overflow: scroll;
1467
+ }
themes/foundation/modules/load-more/load-more.js CHANGED
@@ -32,13 +32,14 @@ function doFoundationLoadMoreReady() {
32
 
33
  // Load More Post Search Results
34
  var loadMorePostSearchLink = 'a.load-more-post-link';
 
35
  jQuery( '#content' ).on( 'click', loadMorePostSearchLink, function( e ) {
36
  jQuery( loadMorePostSearchLink ).addClass( 'ajaxing' ).text( wptouchFdn.ajaxLoading ).prepend( '<span class="spinner"></span>' );
37
  jQuery( '.spinner' ).spin( 'tiny' );
38
  var loadMoreURL = jQuery( loadMorePostSearchLink ).attr( 'rel' );
39
 
40
  jQuery( loadMorePostSearchLink ).after( "<span class='ajax-target'></span>" );
41
- jQuery( '.ajax-target' ).load( loadMoreURL + ' #content #post-results, #content .load-more-post-link', function() {
42
  jQuery( '.ajax-target' ).replaceWith( jQuery( this ).html() );
43
  jQuery( '.ajaxing' ).animate( { height: 'toggle' }, 200, 'linear', function(){ jQuery( this ).remove(); } );
44
  });
@@ -48,13 +49,31 @@ function doFoundationLoadMoreReady() {
48
 
49
  // Load More Page Search Results
50
  var loadMorePageSearchLink = 'a.load-more-page-link';
 
51
  jQuery( '#content' ).on( 'click', loadMorePageSearchLink, function( e ) {
52
  jQuery( loadMorePageSearchLink ).addClass( 'ajaxing' ).text( wptouchFdn.ajaxLoading ).prepend( '<span class="spinner"></span>' );
53
  jQuery( '.spinner' ).spin( 'tiny' );
54
  var loadMoreURL = jQuery( loadMorePageSearchLink ).attr( 'rel' );
55
 
56
  jQuery( loadMorePageSearchLink ).after( "<span class='ajax-target'></span>" );
57
- jQuery( '.ajax-target' ).load( loadMoreURL + ' #content #page-results, #content .load-more-page-link', function() {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
58
  jQuery( '.ajax-target' ).replaceWith( jQuery( this ).html() );
59
  jQuery( '.ajaxing' ).animate( { height: 'toggle' }, 200, 'linear', function(){ jQuery( this ).remove(); } );
60
  });
@@ -63,4 +82,4 @@ function doFoundationLoadMoreReady() {
63
  });
64
 
65
  }
66
- jQuery( document ).ready( function() { doFoundationLoadMoreReady(); });
32
 
33
  // Load More Post Search Results
34
  var loadMorePostSearchLink = 'a.load-more-post-link';
35
+ var postTypeName = jQuery( loadMorePostSearchLink ).data( 'lang-type' ) || 'post';
36
  jQuery( '#content' ).on( 'click', loadMorePostSearchLink, function( e ) {
37
  jQuery( loadMorePostSearchLink ).addClass( 'ajaxing' ).text( wptouchFdn.ajaxLoading ).prepend( '<span class="spinner"></span>' );
38
  jQuery( '.spinner' ).spin( 'tiny' );
39
  var loadMoreURL = jQuery( loadMorePostSearchLink ).attr( 'rel' );
40
 
41
  jQuery( loadMorePostSearchLink ).after( "<span class='ajax-target'></span>" );
42
+ jQuery( '.ajax-target' ).load( loadMoreURL + ' #content #' + postTypeName + '-results, #content .load-more-post-link', function() {
43
  jQuery( '.ajax-target' ).replaceWith( jQuery( this ).html() );
44
  jQuery( '.ajaxing' ).animate( { height: 'toggle' }, 200, 'linear', function(){ jQuery( this ).remove(); } );
45
  });
49
 
50
  // Load More Page Search Results
51
  var loadMorePageSearchLink = 'a.load-more-page-link';
52
+ var pageTypeName = jQuery( loadMorePageSearchLink ).data( 'lang-type' ) || 'page';
53
  jQuery( '#content' ).on( 'click', loadMorePageSearchLink, function( e ) {
54
  jQuery( loadMorePageSearchLink ).addClass( 'ajaxing' ).text( wptouchFdn.ajaxLoading ).prepend( '<span class="spinner"></span>' );
55
  jQuery( '.spinner' ).spin( 'tiny' );
56
  var loadMoreURL = jQuery( loadMorePageSearchLink ).attr( 'rel' );
57
 
58
  jQuery( loadMorePageSearchLink ).after( "<span class='ajax-target'></span>" );
59
+ jQuery( '.ajax-target' ).load( loadMoreURL + ' #content #' + pageTypeName + '-results, #content .load-more-page-link', function() {
60
+ jQuery( '.ajax-target' ).replaceWith( jQuery( this ).html() );
61
+ jQuery( '.ajaxing' ).animate( { height: 'toggle' }, 200, 'linear', function(){ jQuery( this ).remove(); } );
62
+ });
63
+
64
+ e.preventDefault();
65
+ });
66
+
67
+ // Load More Custom Post Search Results
68
+ var loadMoreCustomSearchLink = 'a.load-more-custom-link';
69
+ jQuery( '#content' ).on( 'click', loadMoreCustomSearchLink, function( e ) {
70
+ var customTypeName = jQuery( this ).data( 'lang-type' );
71
+ jQuery( loadMoreCustomSearchLink ).filter( '[data-lang-type="' + customTypeName + '"]' ).addClass( 'ajaxing' ).text( wptouchFdn.ajaxLoading ).prepend( '<span class="spinner"></span>' );
72
+ jQuery( '.spinner' ).spin( 'tiny' );
73
+ var loadMoreURL = jQuery( loadMoreCustomSearchLink ).filter( '[data-lang-type="' + customTypeName + '"]' ).attr( 'rel' );
74
+
75
+ jQuery( loadMoreCustomSearchLink ).filter( '[data-lang-type="' + customTypeName + '"]' ).after( "<span class='ajax-target'></span>" );
76
+ jQuery( '.ajax-target' ).load( loadMoreURL + ' #content #' + customTypeName + '-results, #content .load-more-custom-link[data-lang-type="' + customTypeName + '"]', function() {
77
  jQuery( '.ajax-target' ).replaceWith( jQuery( this ).html() );
78
  jQuery( '.ajaxing' ).animate( { height: 'toggle' }, 200, 'linear', function(){ jQuery( this ).remove(); } );
79
  });
82
  });
83
 
84
  }
85
+ jQuery( document ).ready( function() { doFoundationLoadMoreReady(); });
wptouch.php CHANGED
@@ -2,7 +2,7 @@
2
  /*
3
  Plugin Name: WPtouch Mobile Plugin
4
  Plugin URI: http://www.wptouch.com/
5
- Version: 4.1.7
6
  Description: Make a beautiful mobile-friendly version of your website with just a few clicks
7
  Author: BraveNewCode Inc.
8
  Author URI: http://www.bravenewcode.com/
@@ -14,7 +14,7 @@
14
 
15
  function wptouch_create_four_object() {
16
  if ( !defined( 'WPTOUCH_IS_PRO' ) ) {
17
- define( 'WPTOUCH_VERSION', '4.1.7' );
18
 
19
  define( 'WPTOUCH_BASE_NAME', basename( __FILE__, '.php' ) . '.php' );
20
  define( 'WPTOUCH_DIR', WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . basename( __FILE__, '.php' ) );
2
  /*
3
  Plugin Name: WPtouch Mobile Plugin
4
  Plugin URI: http://www.wptouch.com/
5
+ Version: 4.1.8
6
  Description: Make a beautiful mobile-friendly version of your website with just a few clicks
7
  Author: BraveNewCode Inc.
8
  Author URI: http://www.bravenewcode.com/
14
 
15
  function wptouch_create_four_object() {
16
  if ( !defined( 'WPTOUCH_IS_PRO' ) ) {
17
+ define( 'WPTOUCH_VERSION', '4.1.8' );
18
 
19
  define( 'WPTOUCH_BASE_NAME', basename( __FILE__, '.php' ) . '.php' );
20
  define( 'WPTOUCH_DIR', WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . basename( __FILE__, '.php' ) );