Do not include jquery on the page if you are running in Melody, which…

… includes jquery for you automatically. This preserves compat with Movable Type.
openmelody · Feb 4, 2011 · 550c4bc · 550c4bc
1 parent 9c85f74
commit 550c4bc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/addons/ThemeManager.plugin/config.yaml b/addons/ThemeManager.plugin/config.yaml
@@ -4,7 +4,7 @@ key: ThemeManager
 author_link: http://endevver.com/
 author_name: Endevver
 description: 'A comprehensive theme management plugin!'
-version: 0.10.9
+version: 0.10.10
 schema_version: 7
 static_version: 6
 l10n_class: ThemeManager::L10N

diff --git a/addons/ThemeManager.plugin/lib/ThemeManager/TemplateInstall.pm b/addons/ThemeManager.plugin/lib/ThemeManager/TemplateInstall.pm
@@ -897,7 +897,9 @@ sub xfrm_add_language {
 
     my $old = q{<mt:setvarblock name="html_head" append="1">};
     my $add = <<'HTML';
+<mt:unless tag="ProductName" eq="Melody">
 <script src="<mt:Var name="static_uri">jquery/jquery.js" type="text/javascript"></script>
+</mt:unless>
 <script type="text/javascript">
 $(document).ready( function() {
     // Expand upon the Template Sets dropdown with a visual chooser.

diff --git a/addons/ThemeManager.plugin/tmpl/list_template.tmpl b/addons/ThemeManager.plugin/tmpl/list_template.tmpl
@@ -36,7 +36,9 @@
 </mt:setvarblock>
 <mt:setvarblock name="html_head" append="1">
 <link rel="stylesheet" href="<mt:PluginStaticWebPath component="ThemeManager">css/app.css" type="text/css" />
+<mt:unless tag="ProductName" eq="Melody">
 <script type="text/javascript" src="<mt:Var name="static_uri">jquery/jquery.js"></script>
+</mt:unless>
 <script type="text/javascript">
 
 $(document).ready( function() {

diff --git a/addons/ThemeManager.plugin/tmpl/theme_dashboard.mtml b/addons/ThemeManager.plugin/tmpl/theme_dashboard.mtml
@@ -6,7 +6,9 @@
 <mt:SetVarBlock name="html_head" append="1">
     <link rel="stylesheet" href="<mt:PluginStaticWebPath component="ThemeManager">css/app.css" type="text/css" />
     <link rel="stylesheet" href="<mt:PluginStaticWebPath component="ThemeManager">css/docs.css" type="text/css" />
+<mt:unless tag="ProductName" eq="Melody">
     <script src="<mt:PluginStaticWebPath component="ThemeManager">js/jquery-1.4.2.min.js" type="text/javascript"></script>
+</mt:unless>
     <script src="<mt:PluginStaticWebPath component="ThemeManager">js/jquery.qtip-1.0.min.js" type="text/javascript"></script>
     <script src="<mt:PluginStaticWebPath component="ThemeManager">js/jquery.history.js" type="text/javascript"></script>
     <script src="<mt:PluginStaticWebPath component="ThemeManager">js/app.js" type="text/javascript"></script>

diff --git a/addons/ThemeManager.plugin/tmpl/theme_setup.mtml b/addons/ThemeManager.plugin/tmpl/theme_setup.mtml
@@ -3,7 +3,9 @@
     <link rel="stylesheet" href="<mt:PluginStaticWebPath component="ThemeManager">css/app.css" type="text/css" />
     <link rel="stylesheet" href="<mt:PluginStaticWebPath component="ConfigAssistant">css/app.css" type="text/css" />
     <link rel="stylesheet" href="<mt:PluginStaticWebPath component="ConfigAssistant">colorpicker/css/colorpicker.css" type="text/css" />
-    <script src="<mt:Var name="static_uri">jquery/jquery.js" type="text/javascript"></script>
+<mt:unless tag="ProductName" eq="Melody">
+    <script src="<mt:StaticWebPath>jquery/jquery.js" type="text/javascript"></script>
+</mt:unless>
     <script src="<mt:PluginStaticWebPath component="ConfigAssistant">js/app.js" type="text/javascript"></script>
     <script src="<mt:PluginStaticWebPath component="ConfigAssistant">colorpicker/js/colorpicker.js" type="text/javascript"></script>
     <script type="text/javascript">