Changeset 1773384

Timestamp:

11/22/2017 06:20:19 PM (8 years ago)

Author:

squareoffs

Message:

Allow creation of SquareOff with no end date.

Location:

squareoffs/trunk

Files:

• js/datepicker.js (modified) (2 diffs)
• js/media-button.js (modified) (2 diffs)
• js/templates/modal-insert-content-new.php (modified) (1 diff)
• php/admin/admin.php (modified) (2 diffs)
• php/admin/squareoffs.php (modified) (4 diffs)
• php/class-squareoffs-internal-api.php (modified) (1 diff)
• php/sanitization.php (modified) (2 diffs)
• plugin.php (modified) (1 diff)
• readme.txt (modified) (8 diffs)

squareoffs/trunk/js/datepicker.js

@@ -17 +17 @@
 
     var formatReadableDate = function( date ) {
-        return $.datepicker.formatDate( 'd M yy', date );
+        if ( typeof( date ) !== "undefined" && date !== "" ) {
+            return $.datepicker.formatDate( 'd M yy', date );
+        } else {
+            return "";
+        }
     };
 
@@ -24 +28 @@
         var $dateField = $el.find( '.squareoffs-date-input' );
         var $timeField = $el.find( '.squareoffs-time-input' );
-        var date       = new Date( $dateField.attr( 'data-date-iso' ));
+        var dateIso    = $dateField.attr( 'data-date-iso' );
+        var date       = "";
+
+        if ( typeof( dateIso ) !== "undefined" && dateIso !== "" ) {
+            date = new Date( dateIso );
+        }
 
         var $visibleField = $( '<input />', {

squareoffs/trunk/js/media-button.js

@@ -72 +72 @@
         isReady: function() {
             var ready         = true;
-            var requiredProps = [ 'question', 'side_1_title', 'side_2_title', 'category_uuid', 'end_date' ];
+            var requiredProps = [ 'question', 'side_1_title', 'side_2_title', 'category_uuid' ];
 
             _.each( requiredProps, function( prop ) {
@@ -547 +547 @@
             var date = this.$el.find( '[name="end_date[date]"]' ).val();
             var time = this.$el.find( '[name="end_date[time]"]' ).val();
-
-            try {
-                args.end_date = new Date( date + ' ' + time ).toISOString();
-            } catch ( error ) {
-                var _date = new Date();
-                _date.setFullYear( new Date().getFullYear() + 1 );
-                args.end_date = _date.toISOString();
+            if ( typeof( date ) !== "undefined" && date !== "" ) {
+                try {
+                    args.end_date = new Date( date + ' ' + time ).toISOString();
+                } catch ( error ) {
+                    var _date = new Date();
+                    _date.setFullYear( new Date().getFullYear() + 1 );
+                    args.end_date = _date.toISOString();
+                }
             }
 

squareoffs/trunk/js/templates/modal-insert-content-new.php

@@ -102 +102 @@
             <fieldset>
                 <legend class="screen-reader-text"><?php esc_html_e( 'End date SquareOff' , 'squareoffs' ); ?></legend>
-                <?php squareoffs_render_date_field( 'end_date', new DateTime( '+1 year' ), 'squareoffs-new-end-date-{{ data.cid }}' ); ?>
+                <?php squareoffs_render_date_field( 'end_date', null, 'squareoffs-new-end-date-{{ data.cid }}' ); ?>
             </fieldset>
         </div>

squareoffs/trunk/php/admin/admin.php

@@ -219 +219 @@
     }
     $class   = 'notice notice-error is-dismissible';
-    $message = __( 'Please connect to your SquareOffs account, or <a href="https://www.squareoffs.com/registration/new/" target="_blank">create a new account</a> on squareoffs.com.', 'squareoffs' );
+    $message = __( 'Please connect to your SquareOffs account, or <a href="https://www.squareoffs.com/registration/new/?platform=wordpress" target="_blank">create a new account</a> on squareoffs.com.', 'squareoffs' );
     $dismiss = __( 'Dismiss this warning', 'squareoffs' );
 
@@ -228 +228 @@
                 'a' => array(
                     'href' => array(),
+                    'target' => array(),
                     'title' => array(),
                 ),

squareoffs/trunk/php/admin/squareoffs.php

@@ -290 +290 @@
         $date->setTimezone( new DateTimeZone( 'UTC' ) );
     } else {
-        $date = new DateTime( '+1 year' );
+        $date = null;
     }
 
@@ -304 +304 @@
  * @return void
  */
-function squareoffs_render_date_field( $name, $date, $id = null ) {
+function squareoffs_render_date_field( $name, $date = null, $id = null ) {
 
     $id = ! empty( $id ) ? $id : 'squareoffs-datepicker-' . uniqid();
@@ -320 +320 @@
         esc_attr( $id . '-date' ),
         esc_attr( $name . '[date]' ),
-        esc_attr( $date->format( 'Y-m-d' ) ),
-        esc_attr( $date->format( 'c' ) )
+        esc_attr( empty( $date ) ? "" : $date->format( 'Y-m-d' ) ),
+        esc_attr( empty( $date ) ? "" : $date->format( 'c' ) )
     );
 
@@ -334 +334 @@
         esc_attr( $id . '-time' ),
         esc_attr( $name . '[time]' ),
-        esc_attr( $date->format( 'g:i A' ) )
+        esc_attr( empty( $date ) ? "" : $date->format( 'g:i A' ) )
     );
 

squareoffs/trunk/php/class-squareoffs-internal-api.php

@@ -98 +98 @@
                         'required' => true,
                     ),
-                    'end_date'         => array(
-                        'required' => true,
-                    ),
+                    'end_date'         => array(),
                     'tag_list'         => array(),
                 ),

squareoffs/trunk/php/sanitization.php

@@ -211 +211 @@
         'side_2_photo'     => '',
         'side_2_photo_url' => '',
-        'end_date'         => '',
+        'end_date'         => null,
         'category_uuid'    => '',
         'tag_list'         => '',
         'cover_photo'      => '',
         'cover_photo_url'  => '',
-        'end_date'         => null,
     );
 
@@ -238 +237 @@
 
     // Convert date.
-    if ( $data['end_date'] ) {
+    if ( ! empty( $data['end_date'] ) && ! empty( $data['end_date']['date'] ) ) {
         $data['end_date'] = squareoffs_convert_date( $data['end_date'] );
         unset( $date );
+    } else {
+        unset( $data['end_date'] );
     }
 

squareoffs/trunk/plugin.php

@@ -8 +8 @@
  * Text Domain:     squareoffs
  * Domain Path:     /languages
- * Version:         1.0.0
+ * Version:         1.1.0
  *
  * @package         Squareoffs
  */
 
-define( 'SQUAREOFFS_PLUGIN_VERSION', '1.0.0' );
+define( 'SQUAREOFFS_PLUGIN_VERSION', '1.1.0' );
 defined( 'SQUAREOFFS_PLUGIN_PATH' ) || define( 'SQUAREOFFS_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
 defined( 'SQUAREOFFS_PLUGIN_URL' ) || define( 'SQUAREOFFS_PLUGIN_URL', plugin_dir_url( __FILE__ ) );

squareoffs/trunk/readme.txt

@@ -1 +1 @@
 === SquareOffs ===
 Contributors: squareoffs, humanmade
-Donate link: 
+Donate link:
 Tags: squareoff, debate, poll, vote, comment, engagement, forum, opinion, compare, review, discuss, survey
 Requires at least: 4.6
-Tested up to: 4.8
+Tested up to: 4.9
 Requires PHP: 5.4
-Stable tag: 1.0.0
+Stable tag: 1.1.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -13 +13 @@
 
 == Description ==
-This easy-to-use plugin allows you to embed SquareOffs® directly into your content without ever leaving Wordpress. 
+This easy-to-use plugin allows you to embed SquareOffs® directly into your content without ever leaving Wordpress.
 
-SquareOffs microdebates™ allow digital publishers of all sizes to engage readers, increase traffic, gain insight, and generate new revenue. They are more than just another poll. SquareOffs allow you to engage your readers in an interactive conversational debate where they not only choose a side, but can also explain “why” they made their choice. Readers love it because they can make their voice heard, invite others to join the conversation, vote up top reasons supporting their side, and easily access relevant comments within the innovative dual comment stream. Readers are kept on your site rather than social networks, allowing you to own the conversation. 
+SquareOffs microdebates™ allow digital publishers of all sizes to engage readers, increase traffic, gain insight, and generate new revenue. They are more than just another poll. SquareOffs allow you to engage your readers in an interactive conversational debate where they not only choose a side, but can also explain “why” they made their choice. Readers love it because they can make their voice heard, invite others to join the conversation, vote up top reasons supporting their side, and easily access relevant comments within the innovative dual comment stream. Readers are kept on your site rather than social networks, allowing you to own the conversation.
 
 >SquareOffs placed in an article receive 41% more comments than standard commenting systems.
@@ -28 +28 @@
 * Graphical representation of the shortcode in the Visual editor allows users to easily coordinate the layout of a post or page.
 * Increase site traffic when voters share on social media, pulling new readers back to your site.
-* Create simple, bite-sized content with which readers can easily engage. 
-* Easily link your SquareOffs account to the Wordpress plugin during installation. 
+* Create simple, bite-sized content with which readers can easily engage.
+* Easily link your SquareOffs account to the Wordpress plugin during installation.
 * Configure display settings, colors, font, social sharing, and more.
 
@@ -55 +55 @@
 
 If you already have a SquareOffs account, simply click on "SquareOffs" in the left navigation.
-Enter your SquareOffs login information (email and password). 
+Enter your SquareOffs login information (email and password).
 
 New Account
@@ -73 +73 @@
 == Frequently Asked Questions ==
 = What is a SquareOff? =
-A SquareOff is a piece of content publishers use to engage their audience and allow their readers to share their opinions. Each SquareOff contains a question and two sides. Readers vote for their side, and then comment WHY they voted for that side. 
+A SquareOff is a piece of content publishers use to engage their audience and allow their readers to share their opinions. Each SquareOff contains a question and two sides. Readers vote for their side, and then comment WHY they voted for that side.
 
 = Who can use SquareOffs? =
-SquareOffs is great for digital publishers. From boutique bloggers to high traffic news websites, SquareOffs works with any topic, on any website. SquareOffs is also great for brands and agencies to use as a tool in their toolkit to increase brand engagement and loyalty. 
+SquareOffs is great for digital publishers. From boutique bloggers to high traffic news websites, SquareOffs works with any topic, on any website. SquareOffs is also great for brands and agencies to use as a tool in their toolkit to increase brand engagement and loyalty.
 
 = Where do SquareOffs live? =
@@ -82 +82 @@
 
 = Where should publishers place SquareOffs on a website? =
-This depends on your website, and how your readers interact on your page. Small SquareOffs work great embedded in-line within articles or right on your homepage. Polls Pages are a great to create a new landing page on your site that had not previously existed. 
+This depends on your website, and how your readers interact on your page. Small SquareOffs work great embedded in-line within articles or right on your homepage. Polls Pages are a great to create a new landing page on your site that had not previously existed.
 
 = Why use SquareOffs? =
-SquareOffs is designed for digital publishers to create user-generated debate on any topic, on any website. From small bloggers to high traffic news sites, SquareOffs is a simple tool to increase engagement, revenue, traffic, and insight. 
+SquareOffs is designed for digital publishers to create user-generated debate on any topic, on any website. From small bloggers to high traffic news sites, SquareOffs is a simple tool to increase engagement, revenue, traffic, and insight.
 
 Further support:
@@ -104 +104 @@
 == Changelog ==
 
+= 1.1.0 =
+* Tested with WordPress 4.9s
+* Allow creation of SquareOff with no end date.
+
 = 1.0.0 =
 * Initial release.
@@ -114 +118 @@
 == Upgrade Notice ==
 
-This is our initial release. Please notify us with any feedback at [email protected].
+= 1.1.0 =
+* Tested with WordPress 4.9