Code cleanup and refactoring

Author: Nathan McMinn

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

@@ -1,7 +1,7 @@
 <#include "/org/alfresco/components/form/controls/common/utils.inc.ftl" />
 
 <#if field.control.params.showSelectValues??>
-	<#assign selectValues = field.control.params.showSelectValues?split(",")>
+	<#assign selectValues = field.control.params.showSelectValues?split(";")>
 </#if>
 
 <#if field.control.params.optionSeparator??>
@@ -56,11 +56,20 @@
 
 // first, set up the list of select values that trigger a change
 
+var showSelectValues = {
+	<#list selectValues as value>
+	
+	<#assign showWhenSelectedName = value?split(":")[0]>
+	${value}
+	${value?split(":")?size}
+	${showWhenSelectedName}:[
+	          ],
+	</#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,
-	         showWhenSelected: showWhenSelected
-	      };
+	      });
 //]]></script>

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

@@ -199,37 +199,15 @@ PDFToolkit.Util = {};
 			 */
 			nodeRef: null
 		},
-
-		schemesModule: null,
-		pagesModule: null,
-		pageCount: -1,
 
 		onReady:  function DependentSelect_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();
-			
-			YAHOO.util.Event.addListener([this.id + "-useScheme"], "click", this.toggleSchemes, this);
 		},
 
 		toggleDependentFields: function DependentSelect_toggleSchemes(event, that)
 		{
-			if(event.target.checked)
-			{
-				that.schemesModule.show();
-				that.pagesModule.hide();
-			}
-			else
-			{
-				that.schemesModule.hide();
-				that.pagesModule.show();
-			}
+			
 		}
 	});
 })();
@@ -249,7 +227,7 @@ PDFToolkit.Util = {};
 		for(index in controls)
 		{
 			var control = new YAHOO.util.Dom.get((htmlIdPrefix + "_" + controls[index] + "-cntrl"));
-			var container = control.parentElement
+			var container = control.parentElement;
 			if(value)
 			{
 				container.style.display = 'none';
@@ -260,5 +238,4 @@ PDFToolkit.Util = {};
 			}
 		}
 	}
-}
-)();
+})();

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

@@ -440,9 +440,7 @@
                     </field>
                     <field id="watermark-type">
                     	<control template="/org/alfresco/pdftoolkit/components/form/controls/dependentSelect.ftl">
-                    		<control-param name="showSelectValues">text,image</control-param>
-                    		<control-param name="showWhenSelected-text">watermark-text,watermark-font,watermark-size</control-param>
-                    		<control-param name="showWhenSelected-image">watermark-image</control-param>
+                    		<control-param name="showSelectValues">text:watermark-text,watermark-font,watermark-size;image:watermark-image</control-param>
                     	</control>
                     </field>
                 </appearance>