Merge pull request #1 from dannon/askomics-fixes

Small javascript fixes for askomics IE integration
common-workflow-lab · Nov 15, 2017 · 8d3c8c6 · 8d3c8c6
2 parents 04370eb + 7d674e1
commit 8d3c8c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/config/plugins/interactive_environments/askomics/static/js/askomics.js b/config/plugins/interactive_environments/askomics/static/js/askomics.js
@@ -1,14 +1,9 @@
-function append_notebook(url){
-    clear_main_area();
-    $('#main').append('<iframe frameBorder="0" seamless="seamless" style="width: 100%; height: 100%; overflow:auto;" scrolling="yes" src="'+ url +'"></iframe>'
-    );
-}
-
+var IES = window.IES;
 
 function load_askomics(url){
     $( document ).ready(function() {
-        test_ie_availability(url, function(){
-            append_notebook(url)
+        IES.test_ie_availability(url, function(){
+            IES.append_notebook(url);
         });
     });
 }
diff --git a/config/plugins/interactive_environments/askomics/templates/askomics.mako b/config/plugins/interactive_environments/askomics/templates/askomics.mako
@@ -40,7 +40,8 @@ ${ ie.load_default_js() }
 ${ ie.default_javascript_variables() }
 var url = '${ url }';
 ${ ie.plugin_require_config() }
-requirejs(['interactive_environments', 'plugin/askomics'], function(){
+requirejs(['galaxy.interactive_environments', 'plugin/askomics'], function(IES){
+    window.IES = IES;
     load_askomics(url);
 });
 </script>