2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/eed45027e219/
Changeset: eed45027e219
Branch: next-stable
User: carlfeberhard
Date: 2014-05-28 15:24:01
Summary: Bug fix: allow tags to be added in display_base.mako by swapping the load
order of autocomplete plugins (autocomplete still not working)
Affected #: 2 files
diff -r 26952d141e42bd936eab9465c2761325204f9531 -r
eed45027e219df9c4fc87fcfc788380ecc500b1a templates/display_base.mako
--- a/templates/display_base.mako
+++ b/templates/display_base.mako
@@ -32,10 +32,19 @@
<%def name="javascripts()">
${parent.javascripts()}
- ${h.js( "libs/jquery/jstorage",
"libs/jquery/jquery.autocomplete", "libs/jquery/jquery.rating",
- "galaxy.autocom_tagging" )}
- ${h.js( "galaxy.panels", "libs/jquery/jstorage",
"libs/jquery/jquery.event.drag", "libs/jquery/jquery.event.hover",
- "libs/jquery/jquery.mousewheel", "libs/jquery/jquery-ui",
"libs/require", "libs/farbtastic" )}
+ ${h.js(
+ "libs/jquery/jstorage",
+ "libs/jquery/jquery.rating",
+ "galaxy.panels",
+ "libs/jquery/jquery.event.drag",
+ "libs/jquery/jquery.event.hover",
+ "libs/jquery/jquery.mousewheel",
+ "libs/jquery/jquery-ui",
+ "libs/require",
+ "libs/farbtastic",
+ "libs/jquery/jquery.autocomplete",
+ "galaxy.autocom_tagging"
+ )}
<script type="text/javascript">
diff -r 26952d141e42bd936eab9465c2761325204f9531 -r
eed45027e219df9c4fc87fcfc788380ecc500b1a templates/tagging_common.mako
--- a/templates/tagging_common.mako
+++ b/templates/tagging_common.mako
@@ -211,7 +211,7 @@
use_toggle_link: ${iff( use_toggle_link, 'true', 'false' )}
};
- $('#${elt_id}').find( 'input' ).autocomplete_tagging(options);
+ $('#${elt_id}').autocomplete_tagging(options);
</script>
## Use style to hide/display the tag area.
https://bitbucket.org/galaxy/galaxy-central/commits/f6aa2d17d384/
Changeset: f6aa2d17d384
User: carlfeberhard
Date: 2014-05-28 15:25:23
Summary: merge
Affected #: 2 files
diff -r 950e68808ba693d8eeec87b4be9ce78e4b864456 -r
f6aa2d17d38430e92beb9da80f53c9989dd504ee templates/display_base.mako
--- a/templates/display_base.mako
+++ b/templates/display_base.mako
@@ -32,10 +32,19 @@
<%def name="javascripts()">
${parent.javascripts()}
- ${h.js( "libs/jquery/jstorage",
"libs/jquery/jquery.autocomplete", "libs/jquery/jquery.rating",
- "galaxy.autocom_tagging" )}
- ${h.js( "galaxy.panels", "libs/jquery/jstorage",
"libs/jquery/jquery.event.drag", "libs/jquery/jquery.event.hover",
- "libs/jquery/jquery.mousewheel", "libs/jquery/jquery-ui",
"libs/require", "libs/farbtastic" )}
+ ${h.js(
+ "libs/jquery/jstorage",
+ "libs/jquery/jquery.rating",
+ "galaxy.panels",
+ "libs/jquery/jquery.event.drag",
+ "libs/jquery/jquery.event.hover",
+ "libs/jquery/jquery.mousewheel",
+ "libs/jquery/jquery-ui",
+ "libs/require",
+ "libs/farbtastic",
+ "libs/jquery/jquery.autocomplete",
+ "galaxy.autocom_tagging"
+ )}
<script type="text/javascript">
diff -r 950e68808ba693d8eeec87b4be9ce78e4b864456 -r
f6aa2d17d38430e92beb9da80f53c9989dd504ee templates/tagging_common.mako
--- a/templates/tagging_common.mako
+++ b/templates/tagging_common.mako
@@ -211,7 +211,7 @@
use_toggle_link: ${iff( use_toggle_link, 'true', 'false' )}
};
- $('#${elt_id}').find( 'input' ).autocomplete_tagging(options);
+ $('#${elt_id}').autocomplete_tagging(options);
</script>
## Use style to hide/display the tag area.
Repository URL:
https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from
bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.