Merge branch 'development'

JoomJunk · Feb 23, 2015 · 2485323 · 2485323
2 parents a1bd9c3 + 97cda3a
commit 2485323
Show file tree

Hide file tree

Showing 29 changed files with 1,339 additions and 552 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 Shoutbox
 ========
+
 JoomJunk Shoutbox - A PHP shoutbox designed for use on Joomla sites
 
 Please see the changelog for detailed information about recent changes

diff --git a/changelog.php b/changelog.php
@@ -14,6 +14,20 @@
 - -> Removed
 ! -> Note
 
+Version 3.0.0
++ Integrated AJAX for submitting and retrieving posts
++ Initially hide smilies with toggle option
++ Added Bootstrap and UIKit styling support
++ Added sound notifications for new shouts
+# Fixed Freichat conflict
+# Fixed Kunena profile links
+^ Enhanced HTML markup
+^ Other small PHP enhancements
+
+Version 2.0.2
+^ Updated to jQuery 1.11.2
+- Removed FreiChat check as this extension conflict is now fixed
+
 Version 2.0.1
 - Removed a lot of word from swearwords.php
 ^ Tweak and cleanup of variables + Javascript

diff --git a/mod_shoutbox/fields/check.php b/mod_shoutbox/fields/check.php
diff --git a/mod_shoutbox/fields/fade.php b/mod_shoutbox/fields/fade.php
@@ -0,0 +1,106 @@
+<?php
+/**
+* @package    JJ_Shoutbox
+* @copyright  Copyright (C) 2011 - 2015 JoomJunk. All rights reserved.
+* @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
+*/
+
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field to hide public and private keys fields if maths question is selected
+ *
+ * @package     JJ_Shoutbox
+ * @since       3.0.0
+ */
+class ShoutboxFormFieldFade extends JFormField
+{
+	/**
+	 * @var string
+	 */
+	protected $type = 'fade';
+
+	/**
+	 * @return string
+	 */
+	protected function getLabel()
+	{
+		$doc = JFactory::getDocument();
+		$app = JFactory::getApplication();
+
+		// Import jQuery
+		if (version_compare(JVERSION, '3.0.0', 'ge'))
+		{
+			JHtml::_('jquery.framework');
+		}
+		else
+		{
+			if (!$app->get('jquery'))
+			{
+				$app->set('jquery', true);
+				$doc->addScript('//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js');
+				JHtml::_('script', 'mod_shoutbox/jquery-conflict.js', false, true);
+			}
+		}
+
+		if (version_compare(JVERSION, '3.0.0', 'ge'))
+		{
+			$parent = '.control-group';
+		}
+		else
+		{
+			$parent = 'li';
+		}
+
+
+		$js = '		
+			jQuery(document).ready(function($) {
+
+				var select  = $("#jform_params_securitytype");
+
+				var public  = $("#jform_params_recaptcha_public-lbl").parents("' . $parent . '");
+				var private = $("#jform_params_recaptcha_private-lbl").parents("' . $parent . '");
+				
+				if( select.val() == 0 || select.val()  == 2 ) {
+					public.hide();
+					private.hide();
+				}
+
+				select.on("change", function() {
+
+					var value = this.value;
+
+					if( value == 0 || value == 2 ) {						
+						public.fadeOut();
+						private.fadeOut();
+					}
+					else {						
+						public.fadeIn();
+						private.fadeIn();						
+					}
+
+				});
+
+			});			
+		';
+
+		$doc->addScriptDeclaration($js);
+
+		if (version_compare(JVERSION, '3.0.0', 'ge'))
+		{
+			return '<hr>';
+		}
+
+		return '';
+	}
+
+	/**
+	 * @return mixed
+	 */
+	protected function getInput()
+	{
+        return;
+	}
+
+}
diff --git a/mod_shoutbox/fields/index.html b/mod_shoutbox/fields/index.html
@@ -1 +1 @@
-<html><body bgcolor="#FFFFFF"></body></html>
+<!DOCTYPE html><title></title>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<html><body bgcolor="#FFFFFF"></body></html>
		<!DOCTYPE html><title></title>