@ -20,9 +20,10 @@ define([
'/common/pinpad.js' ,
'/customize/application_config.js' ,
'/common/media-tag.js' ,
'/bower_components/nthen/index.js' ,
] , function ( $ , Config , Messages , Store , Util , Hash , UI , History , UserList , Title , Metadata ,
Messaging , CodeMirror , Files , FileCrypto , Realtime , Clipboard ,
Pinpad , AppConfig , MediaTag {
Pinpad , AppConfig , MediaTag , Nthen ) {
// Configure MediaTags to use our local viewer
if ( MediaTag && MediaTag . PdfPlugin ) {
@ -2071,23 +2072,8 @@ define([
return function ( f ) {
if ( initialized ) {
return void window . setTimeout ( function ( ) {
f ( void 0 , env ) ;
} ) ;
}
var block = 0 ;
var cb = function ( ) {
block -- ;
if ( ! block ) {
initialized = true ;
updateLocalVersion ( ) ;
common . addTooltips ( ) ;
f ( void 0 , env ) ;
if ( typeof ( window . onhashchange ) === 'function' ) { window . onhashchange ( ) ; }
return void setTimeout ( function ( ) { f ( void 0 , env ) ; } ) ;
}
} ;
if ( sessionStorage [ newPadNameKey ] ) {
common . initialName = sessionStorage [ newPadNameKey ] ;
@ -2097,7 +2083,6 @@ define([
common . initialPath = sessionStorage [ newPadPathKey ] ;
delete sessionStorage [ newPadPathKey ] ;
}
common . onFriendRequest = function ( confirmText , cb ) {
common . confirm ( confirmText , cb , null , true ) ;
} ;
@ -2105,20 +2090,9 @@ define([
common . log ( data . logText ) ;
} ;
Store . ready ( function ( err , storeObj ) {
store = common . store = env . store = storeObj ;
common . addDirectMessageHandler ( common ) ;
var proxy = getProxy ( ) ;
var network = getNetwork ( ) ;
network . on ( 'disconnect' , function ( ) {
Realtime . setConnectionState ( false ) ;
} ) ;
network . on ( 'reconnect' , function ( ) {
Realtime . setConnectionState ( true ) ;
} ) ;
var proxy ;
var network ;
var provideFeedback = function ( ) {
if ( Object . keys ( proxy ) . length === 1 ) {
feedback ( "FIRST_APP_USE" , true ) ;
}
@ -2141,8 +2115,25 @@ define([
}
common . reportScreenDimensions ( ) ;
common . reportLanguage ( ) ;
} ;
$ ( function ( ) {
Nthen ( function ( waitFor ) {
Store . ready ( waitFor ( function ( err , storeObj ) {
store = common . store = env . store = storeObj ;
common . addDirectMessageHandler ( common ) ;
proxy = getProxy ( ) ;
network = getNetwork ( ) ;
network . on ( 'disconnect' , function ( ) {
Realtime . setConnectionState ( false ) ;
} ) ;
network . on ( 'reconnect' , function ( ) {
Realtime . setConnectionState ( true ) ;
} ) ;
provideFeedback ( ) ;
} ) , common ) ;
} ) . nThen ( function ( waitFor ) {
$ ( waitFor ( ) ) ;
} ) . nThen ( function ( waitFor ) {
// Race condition : if document.body is undefined when alertify.js is loaded, Alertify
// won't work. We have to reset it now to make sure it uses a correct "body"
UI . Alertify . reset ( ) ;
@ -2164,19 +2155,16 @@ define([
document . location . reload ( ) ;
return ;
}
if ( parsedNew ) {
oldHref = newHref ;
}
if ( parsedNew ) { oldHref = newHref ; }
} ;
if ( PINNING _ENABLED && isLoggedIn ( ) ) {
console . log ( "logged in. pads will be pinned" ) ;
block ++ ;
var w0 = waitFor ( ) ;
Pinpad . create ( network , proxy , function ( e , call ) {
if ( e ) {
console . error ( e ) ;
return cb ( ) ;
return w0 ( ) ;
}
console . log ( 'RPC handshake complete' ) ;
@ -2187,7 +2175,7 @@ define([
common . account . limit = limit ;
localStorage . plan = common . account . plan = plan ;
common . account . note = note ;
cb ( ) ;
w0 ( ) ;
} ) ;
common . arePinsSynced ( function ( err , yes ) {
@ -2208,43 +2196,42 @@ define([
console . log ( 'pinning disabled' ) ;
}
block ++ ;
var w1 = waitFor ( ) ;
require ( [
'/common/rpc.js' ,
] , function ( Rpc ) {
Rpc . createAnonymous ( network , function ( e , call ) {
if ( e ) {
console . error ( e ) ;
return void cb ( ) ;
return void w1 ( ) ;
}
anon _rpc = common . anon _rpc = env . anon _rpc = call ;
cb ( ) ;
w1 ( ) ;
} ) ;
} ) ;
// Everything's ready, continue...
if ( $ ( '#pad-iframe' ) . length ) {
block ++ ;
var w2 = waitFor ( ) ;
var $iframe = $ ( '#pad-iframe' ) ;
var iframe = $iframe [ 0 ] ;
var iframeDoc = iframe . contentDocument || iframe . contentWindow . document ;
if ( iframeDoc . readyState === 'complete' ) {
cb ( ) ;
return ;
return void w2 ( ) ;
}
$iframe . load ( cb ) ;
return ;
$iframe . load ( w2 ) ; //cb);
}
block ++ ;
cb ( ) ;
} ) . nThen ( function ( ) {
updateLocalVersion ( ) ;
common . addTooltips ( ) ;
f ( void 0 , env ) ;
if ( typeof ( window . onhashchange ) === 'function' ) { window . onhashchange ( ) ; }
} ) ;
} , common ) ;
} ;
} ( ) ) ;
// MAGIC that happens implicitly
$ ( function ( ) {
Messages . _applyTranslation ( ) ;
} ) ;
yflory
7 years ago