← Back to branch summary

~ubuntu-branches/ubuntu/natty/zoneminder/natty

« back to all changes in this revision

Viewing changes to web/skins/classic/views/js/video.js

  • Committer: Bazaar Package Importer
  • Author(s): Peter Howard
  • Date: 2009-09-11 07:02:50 UTC
  • mfrom: (1.2.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 10.
  • Revision ID: james.westby@ubuntu.com-20090911070250-k6rtdg43xi46nix4
Tags: 1.24.2-1
Initial release of zoneminder 1.24.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
web/skins/classic/views/js/video.js
12
12
 
13
13
function generateVideoProgress()
14
14
{
15
 
    var tickerText = $('videoProgressTicker').getText();
 
15
    var tickerText = $('videoProgressTicker').get('text');
16
16
    if ( tickerText.length < 1 || tickerText.length > 4 )
17
 
        $('videoProgressTicker').setText( '.' );
 
17
        $('videoProgressTicker').set( 'text', '.' );
18
18
    else
19
19
        $('videoProgressTicker').appendText( '.' );
20
20
}
21
21
 
22
 
function generateVideoResponse( respText )
 
22
function generateVideoResponse( respObj, respText )
23
23
{
24
 
    if ( respText == 'Ok' )
25
 
        return;
26
 
    var response = Json.evaluate( respText );
27
 
 
28
 
    window.location.replace( thisUrl+'?view='+currentView+'&eid='+eventId+'&generated='+((response.result=='Ok')?1:0) );
 
24
    window.location.replace( thisUrl+'?view='+currentView+'&eid='+eventId+'&generated='+((respObj.result=='Ok')?1:0) );
29
25
}
30
26
 
31
27
function generateVideo( form )
32
28
{
33
29
    var parms = 'view=request&request=event&action=video';
34
 
    parms += '&'+form.toQueryString();
35
 
    var query = new Ajax( thisUrl, { method: 'post', data: parms, onComplete: generateVideoResponse } );
36
 
    query.request();
 
30
    parms += '&'+$(form).toQueryString();
 
31
    var query = new Request.JSON( { url: thisUrl, method: 'post', data: parms, onComplete: generateVideoResponse } );
 
32
    query.send();
37
33
    $('videoProgress').removeClass( 'hidden' );
38
34
    $('videoProgress').setProperty( 'class', 'warnText' );
39
 
    $('videoProgressText').setText( videoGenProgressString );
 
35
    $('videoProgressText').set( 'text', videoGenProgressString );
40
36
    generateVideoProgress();
41
37
    generateVideoTimer = generateVideoProgress.periodical( 500 );
42
38
}