From 0a00a8bbe9eaa49fdee4e05ebc97c557569dc53f Mon Sep 17 00:00:00 2001
From: Ben Bosman <ben@atmire.com>
Date: Wed, 16 Mar 2011 16:46:07 +0000
Subject: [PATCH] [DS-843] Autocomplete in authority control contains small
 errors in Mirage

git-svn-id: http://scm.dspace.org/svn/repo/dspace/branches/dspace-1_7_x@6144 9c30dcfa-912a-0410-8fc2-9e0234be79fd
---
 .../Mirage/lib/css/authority-control.css      |  8 +--
 .../general/choice-authority-control.xsl      | 52 ++++++++++---------
 .../Mirage/lib/xsl/core/page-structure.xsl    | 28 ++++++++++
 dspace/CHANGES                                |  1 +
 4 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/css/authority-control.css b/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/css/authority-control.css
index 1450a3f0a7..a02734f2ab 100644
--- a/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/css/authority-control.css
+++ b/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/css/authority-control.css
@@ -7,6 +7,10 @@
  */
 /** Additions for Authority Control elements **/
 /* for scriptaculous autocomplete */
+div.autocomplete {
+    display: none;
+}
+
 div.autocomplete, ul.ui-menu {
   position:absolute;
   width:250px;
@@ -36,10 +40,6 @@ ul.ui-menu li a {
 ul.ui-menu li a.ui-state-hover {
     background-color: #ffb;
 }
-#aspect_submission_StepTransformer_field_dc_title_container {
-    display: none;
-}
-
 /* this magic gets the 16x16 icon to show up.. setting height/width didn't
    do it, but adding padding actually made it show up. */
 img.ds-authority-confidence
diff --git a/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/aspect/general/choice-authority-control.xsl b/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/aspect/general/choice-authority-control.xsl
index 1b23056075..cb5db51ce0 100644
--- a/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/aspect/general/choice-authority-control.xsl
+++ b/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/aspect/general/choice-authority-control.xsl
@@ -214,31 +214,33 @@
       <xsl:param name="confidenceName" select="''"/>
       <xsl:param name="isClosed" select="'false'"/>
       <script type="text/javascript">
-        <xsl:text>window.onload = function() {</xsl:text>
-        <xsl:text>var gigo = DSpaceSetupAutocomplete('</xsl:text>
-        <xsl:value-of select="$formID"/>
-        <xsl:text>', { metadataField: '</xsl:text>
-        <xsl:value-of select="$metadataField"/>
-        <xsl:text>', isClosed: '</xsl:text>
-        <xsl:value-of select="$isClosed"/>
-        <xsl:text>', inputName: '</xsl:text>
-        <xsl:value-of select="$inputName"/>
-        <xsl:text>', authorityName: '</xsl:text>
-        <xsl:value-of select="$authorityName"/>
-        <xsl:text>', containerID: '</xsl:text>
-        <xsl:value-of select="$containerID"/>
-        <xsl:text>', indicatorID: '</xsl:text>
-        <xsl:value-of select="$indicatorID"/>
-        <xsl:text>', confidenceIndicatorID: '</xsl:text>
-        <xsl:value-of select="$confidenceIndicatorID"/>
-        <xsl:text>', confidenceName: '</xsl:text>
-        <xsl:value-of select="$confidenceName"/>
-        <xsl:text>', collection: </xsl:text>
-        <xsl:value-of select="$collectionID"/>
-        <xsl:text>, contextPath: '</xsl:text>
-        <xsl:value-of select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='contextPath'][not(@qualifier)]"/>
-        <xsl:text>'});</xsl:text>
-        <xsl:text>};</xsl:text>
+        <xsl:text>runAfterJSImports.add(function() {</xsl:text>
+            <xsl:text>$(document).ready(function() {</xsl:text>
+                <xsl:text>var gigo = DSpaceSetupAutocomplete('</xsl:text>
+                    <xsl:value-of select="$formID"/>
+                    <xsl:text>', { metadataField: '</xsl:text>
+                    <xsl:value-of select="$metadataField"/>
+                    <xsl:text>', isClosed: '</xsl:text>
+                    <xsl:value-of select="$isClosed"/>
+                    <xsl:text>', inputName: '</xsl:text>
+                    <xsl:value-of select="$inputName"/>
+                    <xsl:text>', authorityName: '</xsl:text>
+                    <xsl:value-of select="$authorityName"/>
+                    <xsl:text>', containerID: '</xsl:text>
+                    <xsl:value-of select="$containerID"/>
+                    <xsl:text>', indicatorID: '</xsl:text>
+                    <xsl:value-of select="$indicatorID"/>
+                    <xsl:text>', confidenceIndicatorID: '</xsl:text>
+                    <xsl:value-of select="$confidenceIndicatorID"/>
+                    <xsl:text>', confidenceName: '</xsl:text>
+                    <xsl:value-of select="$confidenceName"/>
+                    <xsl:text>', collection: </xsl:text>
+                    <xsl:value-of select="$collectionID"/>
+                    <xsl:text>, contextPath: '</xsl:text>
+                    <xsl:value-of select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='contextPath'][not(@qualifier)]"/>
+                <xsl:text>'});</xsl:text>
+            <xsl:text>});</xsl:text>
+        <xsl:text>});</xsl:text>
       </script>
     </xsl:template>
 
diff --git a/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/core/page-structure.xsl b/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/core/page-structure.xsl
index 8c3c9c8a8b..b57f9fbe18 100644
--- a/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/core/page-structure.xsl
+++ b/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/core/page-structure.xsl
@@ -240,6 +240,30 @@
                                      else
                                           return true;
                                 }
+
+                                function FnArray()
+                                {
+                                    this.funcs = new Array;
+                                }
+
+                                FnArray.prototype.add = function(f)
+                                {
+                                    if( typeof f!= "function" )
+                                    {
+                                        f = new Function(f);
+                                    }
+                                    this.funcs[this.funcs.length] = f;
+                                };
+
+                                FnArray.prototype.execute = function()
+                                {
+                                    for( var i=0; i <xsl:text disable-output-escaping="yes">&lt;</xsl:text> this.funcs.length; i++ )
+                                    {
+                                        this.funcs[i]();
+                                    }
+                                };
+
+                                var runAfterJSImports = new FnArray();
             </script>
 
             <!-- Modernizr enables HTML5 elements & feature detects -->
@@ -573,6 +597,10 @@
         <xsl:text disable-output-escaping="yes" >&lt;![endif]--&gt;</xsl:text>
 
 
+        <script type="text/javascript">
+            runAfterJSImports.execute();
+        </script>
+
         <!-- Add a google analytics script if the key is present -->
         <xsl:if test="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='google'][@qualifier='analytics']">
             <script type="text/javascript"><xsl:text>
diff --git a/dspace/CHANGES b/dspace/CHANGES
index 80be07c9f5..9cfde5a848 100644
--- a/dspace/CHANGES
+++ b/dspace/CHANGES
@@ -21,6 +21,7 @@ found online at: https://wiki.duraspace.org/display/DSPACE/DSpaceContributors
 - [DS-808] jqueryUI javascript gets imported without corresponding CSS
 - [DS-809] Support for empty dc.abstract dim field in Internet Explorer
 - [DS-823] DatabaseManager Oracle compliance
+- [DS-843] Autocomplete in authority control contains small errors in Mirage
 
 (Stuart Lewis, Kim Shepherd)
 - [DS-806] Item.match() incorrect logic for schema testing