← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to www/media/console/console.js

  • Committer: chadnickbok
  • Date: 2009-01-22 02:14:14 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:1173
Fixes Issue #14

When uploading files, students will now be shown an
error message if there upload would replace already existing
files.

This upload will not be performed until it will not clobber
any old files.

Note that there is currently a way to change this behaviour in
the code in action.py, to allow files to be overwritten. However
there is no way this flag can be set through the browser interface
(yet).

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/media/console/console.js
81
81
            tmp_path.pop();
82
82
            path = path_join("/home", tmp_path.join('/'));
83
83
        }
84
 
        ajax_call(callback1, "console", "service", {"ivle.op": "start", "cwd": path}, "POST");
 
84
        ajax_call(callback1, "consoleservice", "start", {"startdir": path}, "POST");
85
85
    }
86
86
    else
87
87
    {
88
88
        // No current_path - let the server decide
89
 
        ajax_call(callback1, "console", "service", {"ivle.op": "start"}, "POST");
 
89
        ajax_call(callback1, "consoleservice", "start", {}, "POST");
90
90
    }
91
91
}
92
92
 
256
256
    {
257
257
        var inputline = inputbox;
258
258
        inputbox = null;
 
259
        var graytimer = null;
259
260
    }
260
261
    else
261
262
    {
262
 
        /* Disable the text box */
263
 
        inputbox.setAttribute("disabled", "disabled");
264
 
 
 
263
        GLOBAL_inputbox = inputbox;     /* For timer */
265
264
        var inputline = inputbox.value + "\n";
 
265
        var graytimer = setTimeout("GLOBAL_inputbox.setAttribute(\"class\", "
 
266
            + "\"disabled\");", 100);
266
267
    }
267
268
    var output = document.getElementById("console_output");
268
269
    {
279
280
        span.appendChild(document.createTextNode(inputline));
280
281
        output.appendChild(span);
281
282
    }
282
 
    var args = {"ivle.op": "chat", "kind": which, "key": server_key, "text":inputline};
 
283
    var args = {"key": server_key, "text":inputline};
283
284
    var callback = function(xhr)
284
285
        {
285
 
            console_response(inputbox, inputline, xhr.responseText);
 
286
            console_response(inputbox, graytimer, inputline, xhr.responseText);
286
287
        }
287
 
    ajax_call(callback, "console", "service", args, "POST");
 
288
    /* Disable the text box */
 
289
    if (inputbox != null)
 
290
        inputbox.setAttribute("disabled", "disabled");
 
291
    ajax_call(callback, "consoleservice", which, args, "POST");
288
292
}
289
293
 
290
 
function console_response(inputbox, inputline, responseText)
 
294
function console_response(inputbox, graytimer, inputline, responseText)
291
295
{
292
296
    try
293
297
    {
346
350
        }
347
351
        var callback = function(xhr)
348
352
            {
349
 
                console_response(inputbox, null, xhr.responseText);
 
353
                console_response(inputbox, graytimer,
 
354
                                 null, xhr.responseText);
350
355
            }
351
356
        if (interrupted)
352
357
        {
356
361
        {
357
362
            var kind = "chat";
358
363
        }
359
 
        var args = {"ivle.op": "chat", "kind": kind, "key": server_key, "text":''};
360
 
        ajax_call(callback, "console", "service", args, "POST");
 
364
        var args = {"key": server_key, "text":''};
 
365
        ajax_call(callback, "consoleservice", kind, args, "POST");
361
366
 
362
367
        // Open up the console so we can see the output
363
368
        // FIXME: do we need to maximize here?
378
383
    if (inputbox != null)
379
384
    {
380
385
        /* Re-enable the text box */
 
386
        clearTimeout(graytimer);
381
387
        inputbox.removeAttribute("disabled");
 
388
        inputbox.removeAttribute("class");
382
389
        interrupted = false;
383
390
    }
384
391
 
463
470
    }
464
471
    else
465
472
    {
466
 
        xhr = ajax_call(null, "console", "service", {"ivle.op": "chat", "kind": "terminate", "key": server_key}, "POST");
 
473
        xhr = ajax_call(null, "consoleservice", "restart", {"key": server_key}, "POST");
467
474
        console_response(null, null, null, xhr.responseText);
468
475
    }
469
476
}