Permalink
Browse files

removed jQuery.noConflict() line from app/views/layouts/application.h…

…tml.erb
  • Loading branch information...
1 parent 547c101 commit f834c99458dec57a2eb3c908335153938ffd387c @JonJagger committed Oct 15, 2012
Showing with 2 additions and 3 deletions.
  1. +2 −2 app/assets/javascripts/cyber-dojo_dialog_kata_help.js
  2. +0 −1 app/views/layouts/application.html.erb
@@ -38,7 +38,7 @@ var cyberDojo = (function(cd, $) {
+ '</div>';
var imageButtons = ''
- + '<table>'
+ + '<table cellpadding="0" cellspacing="0">'
+ '<tr>'
+ '<td class="panel">'
+ cd.makeTable(homePageImage, 'opens a' + br + 'home' + br + 'page')
@@ -93,7 +93,7 @@ var cyberDojo = (function(cd, $) {
+ space + 'think about improving, not finishing'
+ '</div>';
- var kataHelp = testButton + imageButtons + hotKeys + improve;
+ var kataHelp = imageButtons + testButton + hotKeys + improve;
cd.dialog(kataHelp, 540, 'help');
};
@@ -15,7 +15,6 @@
<%= favicon_link_tag %>
<%= stylesheet_link_tag :application %>
<%= javascript_include_tag :application %>
- <script type="text/javascript">var $ = jQuery.noConflict();</script>
<script type="text/javascript">var cd = cyberDojo;</script>
<link href="/stylesheets/jquery-ui-1.8.16.custom.css" media="screen" rel="stylesheet" type="text/css" />
</head>

0 comments on commit f834c99

Please sign in to comment.