Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes javascript problems, notably that jqueryui 1.8 is no longer in …

…the google apis and also fixes the call to the apis (rails is supposed to not put .js on an absolute url but it has been)
  • Loading branch information...
commit 8caf642f83fdd98949e4b8f52e3f9e7f3ee8bca3 1 parent e3d3fab
@parndt parndt authored
View
2  VERSION
@@ -1 +1 @@
-0.9.6.10
+0.9.6.11
View
15 public/javascripts/refinery/admin.js
@@ -491,12 +491,17 @@ var image_dialog = {
relevant_src = imageUrl.protocol + '//' + imageUrl.host + relevant_src;
}
- try {
- parent.document.getElementById('wym_src').value = relevant_src;
- parent.document.getElementById('wym_title').value = img.title;
- parent.document.getElementById('wym_alt').value = img.alt;
+ if (parent) {
+ if ((wym_src = parent.document.getElementById('wym_src')) != null) {
+ wym_src.value = relevant_src;
+ }
+ if ((wym_title = parent.document.getElementById('wym_title')) != null) {
+ wym_title.value = img.title;
+ }
+ if ((wym_alt = parent.document.getElementById('wym_alt')) != null) {
+ wym_alt.value = img.alt;
+ }
}
- catch(e){}
}
}
View
8 vendor/plugins/refinery/lib/refinery/application_helper.rb
@@ -54,11 +54,13 @@ def javascript_include_tag(*sources)
def jquery_include_tags(use_caching=RefinerySetting.find_or_set(:use_resource_caching, false))
if !local_request? and RefinerySetting.find_or_set(:use_google_ajax_libraries, true)
- "#{javascript_include_tag "http://www.google.com/jsapi"}
+ "#{javascript_include_tag("http://www.google.com/jsapi").gsub(".js", "")}
<script type='text/javascript'>
google.load('jquery', '1.4');
- google.load('jqueryui', '1.8');
- </script>"
+ //google.load('jqueryui', '1.8');
+ // google isn't using jqueryui 1.8 yet although it was before.
+ </script>
+ #{javascript_include_tag 'jquery-ui-1.8rc1.min.js'}"
else
javascript_include_tag 'jquery', 'jquery-ui-1.8rc1.min.js', :cache => (use_caching ? "cache/libraries" : nil)
end
Please sign in to comment.
Something went wrong with that request. Please try again.