Merge pull request #11 from alleyinteractive/master

Add Support For Static Url and Update Relative Path to Embed.js

README.md

@@ -37,4 +37,9 @@ We recommend something like:
 if ( comments_open() ) {
 	coral_talk_comments_template();
 }
-```
+```
+
+## Version
+Talk version <= `v3.9.1` use talk-wp-plugin `v0.0.6`
+
+Talk version >= `4.0.0` use talk-wp-plugin `v0.1.0`

inc/class-talk-settings-page.php

@@ -53,7 +53,19 @@ function() {
 		);
 		register_setting( 'talk-settings', 'coral_talk_base_url', array(
 			'type' => 'string',
-			'sanitize_callback' => array( $this, 'sanitize_base_url' ),
+			'sanitize_callback' => array( $this, 'sanitize_url' ),
+		) );
+
+		add_settings_field(
+			'coral_talk_static_url',
+			__( 'Talk Static Asset URL', 'coral-project-talk' ),
+			array( $this, 'render_static_url_field' ),
+			'talk-settings',
+			'about-talk'
+		);
+		register_setting( 'talk-settings', 'coral_talk_static_url', array(
+			'type' => 'string',
+			'sanitize_callback' => array( $this, 'sanitize_url' ),
 		) );
 
 		add_settings_field(
@@ -73,7 +85,7 @@ function() {
 	 * @return String Sanitized and untrailingslashed URL.
 	 * @since 0.0.6
 	 */
-	public function sanitize_base_url( $url ) {
+	public function sanitize_url( $url ) {
 		return esc_url( untrailingslashit( $url ) );
 	}
 
@@ -92,6 +104,26 @@ public function render_base_url_field() {
 			type="url"
 			value="<?php echo esc_url( get_option( 'coral_talk_base_url' ) ); ?>"
 		/>
+		<p class="description">The root url of the installed Talk application. This is the same value as <a href="<?php echo esc_url( 'https://coralproject.github.io/talk/configuration/#talk_root_url' ); ?>">TALK_ROOT_URL</a> defined in the Talk application configuration.</p>
+		<?php
+	}
+
+	/**
+	 * Prints input field for static url setting.
+	 *
+	 * @since 0.1.0
+	 */
+	public function render_static_url_field() {
+		?>
+		<input
+				style="width: 600px; height: 40px;"
+				name="coral_talk_static_url"
+				placeholder="https://cdn.talk-assets.com"
+				id="coral_talk_static_url"
+				type="url"
+				value="<?php echo esc_url( get_option( 'coral_talk_static_url' ) ); ?>"
+		/>
+		<p class="description">The root url where static Talk assets should be served from. This is the same value as <a href="<?php echo esc_url( 'https://coralproject.github.io/talk/advanced-configuration/#talk_static_uri' ); ?>">TALK_STATIC_URI</a> defined in the Talk application configuration.</p>
 		<?php
 	}
 

inc/comments-template.php

@@ -9,11 +9,12 @@
  */
 
 $talk_url = get_option( 'coral_talk_base_url' );
+$static_url = get_option( 'coral_talk_static_url', $talk_url );
 $talk_container_classes = get_option( 'coral_talk_container_classes' );
 $div_id = 'coral_talk_' . absint( rand() );
 if ( ! empty( $talk_url ) ) : ?>
 	<div class="<?php echo esc_attr( $talk_container_classes ); ?>" id="<?php echo esc_attr( $div_id ); ?>"></div>
-	<script src="<?php echo esc_url( $talk_url . '/embed.js' ); ?>" async onload="
+	<script src="<?php echo esc_url( $static_url . '/static/embed.js' ); ?>" async onload="
 		Coral.talkStream = Coral.Talk.render(document.getElementById('<?php echo esc_js( $div_id ); ?>'), {
 			talk: '<?php echo esc_url( $talk_url ); ?>'
 		});

talk.php

@@ -3,7 +3,7 @@
  * Plugin Name: Coral Project Talk
  * Plugin URI: https://coralproject.net
  * Description: A plugin to replace stock WP commenting with Talk from the Coral Project
- * Version: 0.0.6
+ * Version: 0.1.0
  * Author: Alley Interactive, The Coral Project
  * Author URI: https://www.alleyinteractive.com
  * License: Apache 2.0