Produced by Araxis Merge on 2/4/2019 11:34:06 AM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | MHPRO_v1.x.zip\mhpro-web-master@18b10e0e051.zip\app\veteran\cordova\grunt_merge\android\common\js | veteran.js | Wed Dec 20 15:17:09 2017 UTC |
| 2 | MHPRO_v1.x.zip\mhpro-web-master@18b10e0e051.zip\app\veteran\cordova\grunt_merge\android\common\js | veteran.js | Fri Feb 1 20:43:48 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 166 |
| Changed | 2 | 4 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | ||
| 2 | window.App = new MHP RO.App({ c ontainer: "div.conta iner-fluid " }); | |
| 3 | var authWi ndowx = nu ll; | |
| 4 | ||
| 5 | App.checkE ula = func tion () { | |
| 6 | //Need to check that EULA has been a ccepted | |
| 7 | if (_. isNull(App _Utils.Get LocalStora ge('MHPRO_ Eula'))) { | |
| 8 | MH PRO.Layout .modal.sho w(MHPRO.Vi ew.Eula = new MHPRO. View.eula( )); | |
| 9 | MH PRO.View.E ula.show() ; | |
| 10 | } | |
| 11 | else { App.vent. trigger('e ula:accept ed'); } | |
| 12 | }; | |
| 13 | App.loadRe sources = function ( ) { | |
| 14 | var re ady = 0; | |
| 15 | var re adyCheck = function () { | |
| 16 | if (ready == = 2) { // set to 2 | |
| 17 | App.vent .trigger(' resources: loaded'); | |
| 18 | } | |
| 19 | } | |
| 20 | var su ccessMustS tart = fun ction () { | |
| 21 | MH PRO.Resour ces.HAReso urces = ne w MHPRO.Co llection.H AResources (); | |
| 22 | MH PRO.Resour ces.HAReso urces.fetc h({ succes s: success Handler }) ; | |
| 23 | MH PRO.Resour ces.MHPROR esources = new MHPRO .Collectio n.MHPRORes ources(); | |
| 24 | MH PRO.Resour ces.MHPROR esources.f etch({ suc cess: succ essHandler }); | |
| 25 | }; | |
| 26 | var su ccessHandl er = funct ion (colle ction, res ponse, opt ions) { | |
| 27 | re ady++; | |
| 28 | re adyCheck() ; | |
| 29 | }; | |
| 30 | MHPRO. Resources. App = new App_Resour ces.Collec tion.AppRe sources(MH PRO_Data.r esource_di rectory.li nks); | |
| 31 | succes sMustStart (); | |
| 32 | }; | |
| 33 | ||
| 34 | App.on('st art', func tion () { | |
| 35 | App_Resour ces.hostna me = "http s:// DNS .vamisece. io/"; | |
| 36 | MHPRO. Layout = n ew MHPRO.V iew.layout (); | |
| 37 | MHPRO. Layout.ren der(); | |
| 38 | if (wi ndow.locat ion.href.i ndexOf("to ken") > -1 ) { | |
| 39 | Ap p_Utils.Se tSessionTo ken('token ', App_Uti ls.GetUrlP arameter(' token')); | |
| 40 | wi ndow.locat ion = App_ Utils.SetU rl(); | |
| 41 | } | |
| 42 | else { | |
| 43 | Ap p.loadReso urces(); | |
| 44 | } | |
| 45 | }); | |
| 46 | ||
| 47 | App.vent.o n('eula:ac cepted', f unction () { | |
| 48 | MHPRO. Layout.hea der.show(M HPRO.View. header = n ew MHPRO.V iew.Header ()); | |
| 49 | MHPRO. Layout.foo ter.show(n ew MHPRO.V iew.footer ()); | |
| 50 | MHPRO. Router = n ew MHPRO.R outer(); | |
| 51 | Backbo ne.history .start(); | |
| 52 | //Set Authorize Request he ader | |
| 53 | App_Ut ils.SetReq uestHeader (); | |
| 54 | //Trig ger event to load us er | |
| 55 | App.ve nt.trigger ('load:use r', { init : true }); | |
| 56 | }); | |
| 57 | ||
| 58 | App.loginO ptions = f unction() { | |
| 59 | var redire ctUri = 'h ttps:// DNS .vamisece. io/mhpro/' , | |
| 60 | op tions = { | |
| 61 | appName: 'mhpro', | |
| 62 | autoRedi rect: true , | |
| 63 | redirect Uri: redir ectUri, | |
| 64 | resource sLink: App _Utils.Get DomainPath ()+'mhproR esources', | |
| 65 | authoriz eUrl: MHPR O.Resource s.HAResour ces.findWh ere({title :'oauth-au thorize'}) .get('href ') | |
| 66 | }; | |
| 67 | return options; | |
| 68 | }; | |
| 69 | ||
| 70 | App.vent.o n('resourc es:loaded' , function () { | |
| 71 | ||
| 72 | App.lo ginUtils = new Login Utils(App. loginOptio ns()); | |
| 73 | if (Ap p_Utils.Ge tSessionTo ken() != n ull) { | |
| 74 | Ap p.checkEul a(); | |
| 75 | } | |
| 76 | else { | |
| 77 | Ap p.loginUti ls.checkFo rAuthCode( ); | |
| 78 | se tTimeout(f unction(){ | |
| 79 | if (App_ Utils.GetS essionToke n()) { | |
| 80 | loca tion.reloa d(true) | |
| 81 | } | |
| 82 | }, 1000); | |
| 83 | } | |
| 84 | }); | |
| 85 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.