← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: William Grant
  • Date: 2009-01-22 04:02:36 UTC
  • mfrom: (1089)
  • mto: This revision was merged to the branch mainline in revision 1090.
  • Revision ID: grantw@unimelb.edu.au-20090122040236-nm0lby0aymmzk5d7
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/media/browser/browser.js
377
377
    upload_callback_count++;
378
378
    if (upload_callback_count >= 2)
379
379
    {
 
380
        myFrame = frames['upload_iframe'].document;
 
381
        data = myFrame.firstChild.childNodes[1].firstChild.firstChild.nodeValue;
 
382
        data = JSON.parse(data);
 
383
        if ('Error' in data)
 
384
            alert("Error: " + decodeURIComponent(data['Error']));
380
385
        document.getElementsByName('data')[0].value = '';
381
386
        refresh();
382
387
    }