diff --git a/scripts/RecTest.js b/scripts/RecTest.js index a658d59..9ba5c40 100644 --- a/scripts/RecTest.js +++ b/scripts/RecTest.js @@ -1,4 +1,3 @@ - /** * Facade for the entire application */ @@ -56,27 +55,39 @@ rectest.RecTest = Class( 'RecTest', }, - 'bindContinue': function( $element, callback ) + 'public goConfig': function() { - var _self = this, - $body = this._jQuery( 'body' ); + this._jQuery( 'body' ) + .removeClass( 'pending' ) + .removeClass( 'testing' ) + ; - $element.click( function() + return this; + }, + + + 'public goVerify': function() + { + this._jQuery( 'body' ).addClass( 'pending' ); + return this; + }, + + + 'public run': function() + { + var _self = this, + $body = this._jQuery( 'body' ), + options = this._getOptions(), + testcase = this._cases[ options['case'] ].testCase(); + + $body.addClass( 'testing' ).removeClass( 'pending' ); + + this._runner.run( testcase, options, function( history ) { - var options = _self._getOptions(), - testcase = _self._cases[ options['case'] ].testCase(); + _self.goConfig(); - $body.addClass( 'testing' ); - - _self._runner.run( testcase, options, function( history ) - { - $body.removeClass( 'testing' ); - - console.log( history ); - console.log( 'done' ); - } ); - - callback && callback.call( _self.__inst ); + console.log( history ); + console.log( 'done' ); } ); return this; diff --git a/scripts/main.js b/scripts/main.js index df39eec..310f922 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -7,8 +7,22 @@ window.rectest = { cases: {} }; $( document ).ready( function() { - rectest.RecTest( jQuery, rectest.cases ).init() + var app = rectest.RecTest( jQuery, rectest.cases ).init() .listCases( $( '#case' ) ) - .bindContinue( $( '#continue' ) ) ; + + $( '#continue' ).click( function() + { + app.goVerify(); + } ); + + $( '#reconfigure' ).click( function() + { + app.goConfig(); + } ); + + $( '#run' ).click( function() + { + app.run(); + } ); } ); diff --git a/style.css b/style.css index f77bf92..8134811 100644 --- a/style.css +++ b/style.css @@ -24,16 +24,6 @@ dd { display: block; } -.testing .while-idle { - display: none; -} -.while-testing { - display: none; -} -.testing .while-testing { - display: block; -} - .topbox { position: absolute; @@ -113,3 +103,21 @@ dd { width: 300px; height: 300px; } + + +/** after everything else to ensure it takes precidence **/ +.pending .while-idle, +.testing .while-idle { + display: none; +} +.while-pending, +.while-testing { + display: none; +} +.pending .while-pending, +.testing .while-testing { + display: block; +} +.testing .until-testing { + display: none; +} diff --git a/test.html b/test.html index 94eda78..e2e9413 100644 --- a/test.html +++ b/test.html @@ -5,7 +5,7 @@ -

Recollection Test

+

Recollection Test