← 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: mattgiuca
  • Date: 2008-01-30 23:43:24 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:341
www/media/console/console.js: Merged in Tom's changes from console/console.js.
    (Bad that we have two versions of this ... about to rectify).

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/media/console/console.js
209
209
    else if (res.hasOwnProperty('exc'))
210
210
    {
211
211
        // Failure!
 
212
        // print out any output that came before the error
 
213
        if (res.exc[0].length > 0)
 
214
        {
 
215
            var pre = document.createElement("pre");
 
216
            pre.setAttribute("class", "outputMsg");
 
217
            pre.appendChild(document.createTextNode(res.exc[0]));
 
218
            output.appendChild(pre);
 
219
        }
 
220
 
212
221
        // print out the error message (res.exc)
213
222
        var pre = document.createElement("pre");
214
223
        pre.setAttribute("class", "errorMsg");
215
 
        pre.appendChild(document.createTextNode(res.exc));
 
224
        pre.appendChild(document.createTextNode(res.exc[1]));
216
225
        output.appendChild(pre);
217
226
    }
218
227
    else if (res.hasOwnProperty('more'))