Merge branch 'dev/1-6-2'

Conflicts:
	readme.md

Gruntfile.js

@@ -97,14 +97,6 @@ module.exports = function(grunt) {
 
 			// Create a ZIP file
 			zip: 'python /usr/bin/git-archive-all ../gravityview.zip'
-		},
-
-		wp_readme_to_markdown: {
-			your_target: {
-				files: {
-					'readme.md': 'readme.txt'
-				},
-			},
 		}
 	});
 

assets/js/admin-views.js

@@ -35,7 +35,7 @@
             // Start by showing/hiding on load
             vcfg.toggleInitialVisibility(vcfg);
 
-		// Start bind to $('body')
+		    // Start bind to $('body')
             $('body')
 
             	// select form
@@ -474,7 +474,7 @@
 
             var data = {
                 action: 'gv_sortable_fields_form',
-                nonce: gvGlobals.nonce,
+                nonce: gvGlobals.nonce
             };
 
             if (context !== undefined && 'preset' === context) {
@@ -637,7 +637,7 @@
             var data = {
                 action: 'gv_get_active_areas',
                 template_id: template,
-                nonce: gvGlobals.nonce,
+                nonce: gvGlobals.nonce
             };
 
             $.post(ajaxurl, data, function (response) {
@@ -661,7 +661,7 @@
             var data = {
                 action: 'gv_get_preset_fields',
                 template_id: template,
-                nonce: gvGlobals.nonce,
+                nonce: gvGlobals.nonce
             };
 
             $.post(ajaxurl, data, function (response) {
@@ -735,9 +735,9 @@
                     disabled: true, // Don't open on hover
                     position: {
                         my: "center bottom",
-                        at: "center top-12",
+                        at: "center top-12"
                     },
-                    tooltipClass: 'top',
+                    tooltipClass: 'top'
                 })
                 // add title attribute so the tooltip can continue to work (jquery ui bug?)
                 .attr("title", "")
@@ -1181,10 +1181,11 @@
 
         	// If the View isn't a Start Fresh view, we just return true
         	// so that the click on the Publish button can process.
-        	if (!vcfg.startFreshStatus || templateId === '') {
+        	if ( !vcfg.startFreshStatus || templateId === '' ) {
 
         		// Serialize the inputs so that `max_input_vars`
-        		return vcfg.serializeForm( e );
+                return vcfg.serializeForm();
+
         	}
 
         	return false;
@@ -1199,9 +1200,15 @@
          * @param  {[type]} e [description]
          * @return {[type]}   [description]
          */
-        serializeForm: function (e) {
+        serializeForm: function( e ) {
 
-            e.stopPropagation();
+            if( $( e.target ).data('gv-valid') ) {
+                return true;
+            }
+
+            e.stopImmediatePropagation();
+
+            $( e.target ).data('gv-valid', false );
 
         	/**
         	 * Add slashes to date fields so stripslashes doesn't strip all of them
@@ -1227,7 +1234,15 @@
         		'type': 'hidden'
         	}));
 
-            return true;
+
+            // make sure the "slow" browsers did append all the serialized data to the form
+            setTimeout( function() {
+
+                $( e.target ).data( 'gv-valid', true ).submit();
+
+            }, 101 );
+
+            return false;
 
         },
 

gravityview.php

@@ -14,7 +14,7 @@
  * Plugin Name:       	GravityView
  * Plugin URI:        	http://gravityview.co
  * Description:       	Create directories based on a Gravity Forms form, insert them using a shortcode, and modify how they output.
- * Version:          	1.6.1
+ * Version:          	1.6.2
  * Author:            	Katz Web Services, Inc.
  * Author URI:        	http://www.katzwebservices.com
  * Text Domain:       	gravityview
@@ -69,7 +69,7 @@
  */
 final class GravityView_Plugin {
 
-	const version = '1.6.1';
+	const version = '1.6.2';
 
 	public static $theInstance;
 

includes/class-admin-welcome.php

@@ -298,6 +298,13 @@ public function changelog_screen() {
 
 				<hr />
 
+				<h3>Changes in 1.6.2 (Full List)</h3>
+				<ul>
+					<li>Added: Two new hooks in the Custom Content field to enable conditional logic or enable <code>the_content</code> WordPress filter which will trigger the Video embed (<a href="http://docs.gravityview.co/article/227-how-can-i-transform-a-video-link-into-a-player-using-the-custom-content-field">read how</a>)</li>
+					<li>Fixed: Issue when embedding multiple DataTables views in the same page</li>
+					<li>Tweak: A more robust "Save View" procedure to prevent losing field configuration on certain browsers</li>
+				</ul>
+
 				<h3>Changes in 1.6.1 (Full List)</h3>
 
 				<ul>

includes/class-data.php

@@ -167,8 +167,11 @@ function add_view( $view_id, $atts = NULL ) {
 		// Handle array of IDs
 		if( is_array( $view_id ) ) {
 			foreach( $view_id as $id ) {
-				return $this->add_view( $id, $atts );
+
+				$this->add_view( $id, $atts );
 			}
+
+			return $this->views;
 		}
 
 		// The view has been set already; returning stored view.

languages/gravityview-bn_BD.po

@@ -1,14 +1,14 @@
 # 
 # Translators:
-# Md Akter Hosen <[email protected]>, 2014
+# Md Akter Hosen <[email protected]>, 2014-2015
 # Md Akter Hosen <[email protected]>, 2014
 # Zachary Katz <[email protected]>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: GravityView\n"
 "POT-Creation-Date: 2015-02-13 00:24-0700\n"
-"PO-Revision-Date: 2015-02-13 07:25+0000\n"
-"Last-Translator: Zachary Katz <[email protected]>\n"
+"PO-Revision-Date: 2015-02-23 09:31+0000\n"
+"Last-Translator: Md Akter Hosen <[email protected]>\n"
 "Language-Team: Bengali (http://www.transifex.com/projects/p/gravityview/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -466,7 +466,7 @@ msgstr "এই ফর্মের সেটিংস সম্পাদন ক
 
 #: includes/class-admin-views.php:257
 msgid "Preview Form"
-msgstr ""
+msgstr "ফরম দেখুন"
 
 #: includes/class-admin-views.php:257
 msgid "Preview this form"
@@ -555,13 +555,13 @@ msgstr "\"+ %s\" অথবা এখানে পুরাতনগুলো ট
 #: includes/class-admin-views.php:789
 #, php-format
 msgid "This View is configured using the %s View type, which is disabled."
-msgstr ""
+msgstr "এই দৃশ্যটি %s দৃশ্য ব্যবহার করে কনফিগার করা হয়েছে, যেটি নিস্ক্রিয় রয়েছে।"
 
 #: includes/class-admin-views.php:790
 msgid ""
 "The data is not lost; re-activate the associated plugin and the "
 "configuration will re-appear."
-msgstr ""
+msgstr "তথ্য হারিয়ে যায়নি। সংশ্লিষ্ঠ প্লাগইন্সটি সক্রিয় করুন এবং কনফিগারেশন পুনরায় দেখাবে।"
 
 #: includes/class-admin-views.php:867
 msgid "Enter View name here"
@@ -635,7 +635,7 @@ msgstr "পরিবর্তনের লিস্ট"
 
 #: includes/class-admin-welcome.php:256
 msgid "What&rsquo;s New"
-msgstr ""
+msgstr "নতুন &rsquo; কি"
 
 #: includes/class-admin-welcome.php:736
 msgid "GravityView is brought to you by:"