Merge pull request #1123 from ElDeveloper/moi-bug

BUG: Fix bug in moi.init

Author: antgonza

qiita_pet/static/vendor/js/moi.js

@@ -66,15 +66,15 @@ var moi = new function () {
      * websocket. On construction, this method will send a message over the
      * socket to get all known job information associated with this client.
      *
-     * @param {host} The URL for the websocket, minus the ws:// header, or null
-     * to use the default moi-ws.
      * @param {group_id} A group ID to get initial data from, or null to fetch
      * all records associated with the user.
+     * @param {host} The URL for the websocket, minus the ws:// header, or null
+     * to use the default moi-ws.
      * @param {on_open} Optional function for action when websocket is opened.
      * @param {on_close} Optional function for action when websocket is closed.
      * @param {on_error} Optional function for action when websocket errors.
      */
-    this.init = function(host, group_id, on_open, on_close, on_error) {
+    this.init = function(group_id, host, on_open, on_close, on_error) {
         host = host || window.location.host + '/moi-ws/';
         if (!("WebSocket" in window)) {
             alert("Your browser does not appear to support websockets!");

qiita_pet/templates/analysis_selected.html

@@ -58,7 +58,7 @@
     check_color();
 }
 $(document).ready(function() {
-      moi.init(window.location.host + '/analysis/selected/socket/', null, function(){}, error, error);
+      moi.init(null, window.location.host + '/analysis/selected/socket/', function(){}, error, error);
       moi.add_callback('remove_pd', remove_pd_from_html);
       moi.add_callback('remove_sample', remove_sample_from_html);
       moi.add_callback('clear', clear_from_html);

qiita_pet/templates/list_studies.html

@@ -55,7 +55,7 @@
 }
 
 $(document).ready(function() {
-        moi.init(window.location.host + '/study/list/socket/', null, function(){}, error, error);
+        moi.init(null, window.location.host + '/study/list/socket/', function(){}, error, error);
         moi.add_callback('sel', show_alert);
         function format ( d, row ) {
             // `d` is the original data object for the row