Multiple fixes to pageSelect and dependentSelect

JS and FTL fixes to page select and dependent select controls.

Author: Nathan McMinn

pdf-toolkit-share/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/dependentSelect.ftl

@@ -31,7 +31,7 @@
    <#else>
       <label for="${fieldHtmlId}">${field.label?html}:<#if field.mandatory><span class="mandatory-indicator">${msg("form.required.fields.marker")}</span></#if></label>
       <#if field.control.params.options?? && field.control.params.options != "">
-         <select id="${fieldHtmlId}" name="${field.name}" onchange="DependentSelect.toggleDependentFields()" tabindex="0"
+         <select id="${fieldHtmlId}" name="${field.name}" tabindex="0"
                <#if field.description??>title="${field.description}"</#if>
                <#if field.control.params.size??>size="${field.control.params.size}"</#if> 
                <#if field.control.params.styleClass??>class="${field.control.params.styleClass}"</#if>
@@ -56,20 +56,26 @@
 
 // first, set up the list of select values that trigger a change
 
-var showSelectValues = {
+var showSelectValues = [
 	<#list selectValues as value>
 	
 	<#assign showWhenSelectedName = value?split(":")[0]>
-	${value}
-	${value?split(":")?size}
-	${showWhenSelectedName}:[
-	          ],
+	<#assign showWhenSelectedValues = value?split(":")[1]?split(",")>
+	{'name':'${showWhenSelectedName}',
+	'fields':[
+	<#list showWhenSelectedValues as show>
+		'${show}'<#if show_has_next>,</#if>
+	</#list>
+	          ]}<#if value_has_next>,</#if>
 	</#list>	
-}
+]
 // next, set up the object that contains the fields to show / hide based on 
 // the value of the selects
 var DependentSelect = new PDFToolkit.DependentSelect("${fieldHtmlId}").setOptions(
 	      {
 	         showSelectValues: showSelectValues,
-	      });
+	         htmlId: "${args.htmlid}"
+	      }).setMessages(
+	         {}
+	      );
 //]]></script>

pdf-toolkit-share/src/main/resources/META-INF/pdftoolkit/components/doclib/pdftoolkit-doclib-actions.js

@@ -49,7 +49,15 @@ PDFToolkit.Util = {};
 			 * @property nodeRef
 			 * @type string
 			 */
-			nodeRef: null
+			nodeRef: null,
+			
+			/**
+			 * Do we show the page scheme options?
+			 * 
+			 * @property showPageSchemes
+			 * @type boolean
+			 */
+			showPageScheme: false,
 		},
 
 		schemesModule: null,
@@ -59,13 +67,15 @@ PDFToolkit.Util = {};
 		onReady:  function SelectPage_onReady()
 		{
 			this.getPageCount(this.options.nodeRef);
-			this.getPageSchemes(this.options.nodeRef);
-			
-			this.schemesModule = new YAHOO.widget.Module(this.id + "-schemeModule");
 			this.pagesModule = new YAHOO.widget.Module(this.id + "-pageModule");
 
-			// default state is schemes enabled, page select hidden
-			this.pagesModule.hide();
+			if(this.options.showPageScheme === "true")
+			{
+				this.schemesModule = new YAHOO.widget.Module(this.id + "-schemeModule");
+				this.getPageSchemes(this.options.nodeRef);
+				// default state is page select hidden if page schemes enabled, 
+				this.pagesModule.hide();
+			}
 
 			YAHOO.util.Event.addListener([this.id + "-useScheme"], "click", this.toggleSchemes, this);
 		},
@@ -169,10 +179,10 @@ PDFToolkit.Util = {};
 	Selector = YAHOO.util.Selector;
 
 	/**
-	 * SelectPage constructor.
+	 * DependentSelect constructor.
 	 *
 	 * @param {String} htmlId The HTML id of the parent element
-	 * @return {PDFToolkit.SelectPage} The new component instance
+	 * @return {PDFToolkit.DependentSelect} The new component instance
 	 * @constructor
 	 */
 	PDFToolkit.DependentSelect = function DependentSelect_constructor(htmlId)
@@ -183,31 +193,51 @@ PDFToolkit.Util = {};
 
 	YAHOO.extend(PDFToolkit.DependentSelect, Alfresco.component.Base,
 	{
-		/**
-		 * Object container for initialization options
-		 *
-		 * @property options
-		 * @type {object} object literal
-		 */
 		options:
 		{
 			/**
-			 * Reference to the pdf document
+			 * The show / hide configuration(s) for the form controls
 			 *
 			 * @property nodeRef
 			 * @type string
 			 */
-			nodeRef: null
+			showSelectValues: []
 		},
 
 		onReady:  function DependentSelect_onReady()
 		{	
-			
+			YAHOO.util.Event.addListener([this.id], "change", this.toggleDependentFields, this);
 		},
 
-		toggleDependentFields: function DependentSelect_toggleSchemes(event, that)
+		toggleDependentFields: function DependentSelect_toggleDependentFields(event, that)
 		{
-			
+			var config = that.options.showSelectValues;
+			// anything assigned to another show value will be hidden
+			for(index in config)
+			{
+				
+				var name = config[index].name;
+				var fields = config[index].fields;
+				
+				// if the event source is the right option, show the fields
+				// if it is not, hide these fields
+				if(name === event.srcElement.value)
+				{
+					for(fieldIndex in fields)
+					{
+						var fieldId = YAHOO.util.Dom.get(that.options.htmlId) + "_" + fields[fieldIndex] + "-cntrl";
+						fieldId.style.display = 'block';
+					}
+				}
+				else
+				{
+					for(fieldIndex in fields)
+					{
+						var fieldId = YAHOO.util.Dom.get(that.options.htmlId) + "_" + fields[fieldIndex] + "-cntrl";
+						fieldId.style.display = 'none';
+					}
+				}
+			}
 		}
 	});
 })();

pdf-toolkit-share/src/main/resources/META-INF/share-config-custom.xml

@@ -372,9 +372,9 @@
         			<show id="key-type"/>
         			<show id="key-password"/>
         			<show id="store-password"/>
-        			<show id="visibility"/>
         			<show id="location"/>
         			<show id="reason"/>
+        			<show id="visibility"/>
         			<show id="page"/>
         			<show id="position"/>
         			<show id="location-x"/>
@@ -395,8 +395,7 @@
                     </field>
                     <field id="position">
                     	<control template="/org/alfresco/pdftoolkit/components/form/controls/dependentSelect.ftl">
-                    		<control-param name="showSelectValues">manual</control-param>
-                    		<control-param name="showWhenSelected-manual">location-x,location-y</control-param>
+                    		<control-param name="showSelectValues">manual:prop_location-x,prop_location-y</control-param>
                     	</control>
                     </field>
                 </appearance>
@@ -434,13 +433,12 @@
                     </field>
                     <field id="position">
                         <control template="/org/alfresco/pdftoolkit/components/form/controls/dependentSelect.ftl">
-                    		<control-param name="showSelectValues">manual</control-param>
-                    		<control-param name="showWhenSelected-manual">location-x,location-y</control-param>
+                    		<control-param name="showSelectValues">manual:prop_location-x,prop_location-y</control-param>
                     	</control>
                     </field>
                     <field id="watermark-type">
                     	<control template="/org/alfresco/pdftoolkit/components/form/controls/dependentSelect.ftl">
-                    		<control-param name="showSelectValues">text:watermark-text,watermark-font,watermark-size;image:watermark-image</control-param>
+                    		<control-param name="showSelectValues">text:prop_watermark-text,prop_watermark-font,prop_watermark-size;image:assoc_watermark-image</control-param>
                     	</control>
                     </field>
                 </appearance>