Merge pull request #1746 from skurvish/joomla3

Fullcalendar fixes:
Fabrik · Jun 5, 2016 · b57ea54 · b57ea54
2 parents 6b75ceb + 26afc22
commit b57ea54
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 33 deletions.
diff --git a/components/com_fabrik/helpers/html.php b/components/com_fabrik/helpers/html.php
@@ -1045,7 +1045,7 @@ public static function iniRequireJs($shim = array(), $paths = array())
 		{
 			if (is_array($newShim) && array_key_exists($k, $newShim))
 			{
-				$s->deps = array_merge($s->deps, $newShim[$k]->deps);
+				$s->deps = array_unique(array_merge($s->deps, $newShim[$k]->deps));
 			}
 
 			$newShim[$k] = $s;

diff --git a/plugins/fabrik_visualization/fullcalendar/forms/fields.xml b/plugins/fabrik_visualization/fullcalendar/forms/fields.xml
@@ -127,6 +127,26 @@
 					<option value="1">JYES</option>
 			</field>
 
+			<field name="show-weekends"
+				type="radio"
+				default="1"
+				class="btn-group"
+				description="PLG_VISUALIZATION_FULLCALENDAR_SHOW_WEEKENDS_DESC"
+				label="PLG_VISUALIZATION_FULLCALENDAR_SHOW_WEEKENDS_LABEL">
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+			</field>
+
+			<field name="greyscaled-weekend"
+				type="radio"
+				default="0"
+				class="btn-group"
+				description="PLG_VISUALIZATION_FULLCALENDAR_GREYSCALE_WEEKEND_DESC"
+				label="PLG_VISUALIZATION_FULLCALENDAR_GREYSCALE_WEEKEND_LABEL" >
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+			</field>
+
 			<field name="fullcalendar_default_view"
 				type="list"
 				default="monthView"
@@ -217,16 +237,6 @@
 
 		<fieldset label="PLG_VISUALIZATION_FULLCALENDAR_MONTH_VIEW_OPTIONS" name="plg-visualization-fullcalendar-monthview">
 
-			<field name="greyscaled-week-end"
-				type="radio"
-				default="0"
-				class="btn-group"
-				description="PLG_VISUALIZATION_FULLCALENDAR_GREYSCALE_WEEKEND_DESC"
-				label="PLG_VISUALIZATION_FULLCALENDAR_GREYSCALE_WEEKEND_LABEL" >
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-			</field>
-
 			<field name="readonly_monthview"
 				type="radio"
 				class="btn-group"
@@ -272,17 +282,7 @@
 				description="PLG_VISUALIZATION_FULLCALENDAR_CLOSE_HOUR_DESC"
 				label="PLG_VISUALIZATION_FULLCALENDAR_CLOSE_HOUR_LABEL"
 				size="8" />
-
-			<field name="fullcalendar-show-weekends"
-				type="radio"
-				default="1"
-				class="btn-group"
-				description="PLG_VISUALIZATION_FULLCALENDAR_SHOW_WEEKENDS_DESC"
-				label="PLG_VISUALIZATION_FULLCALENDAR_SHOW_WEEKENDS_LABEL">
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-			</field>
-
+
 		</fieldset>
 
 	</fields>

diff --git a/plugins/fabrik_visualization/fullcalendar/fullcalendar-min.js b/plugins/fabrik_visualization/fullcalendar/fullcalendar-min.js