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\common\js | veteran.js | Wed Dec 20 15:17:09 2017 UTC |
| 2 | MHPRO_v1.x.zip\mhpro-web-master@18b10e0e051.zip\app\common\js | veteran.js | Fri Feb 1 19:29:11 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 178 |
| Changed | 1 | 2 |
| 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 MHPRO.App ({ contain er: "div.c ontainer-f luid" }); | |
| 3 | App.ch eckEula = function ( ) { | |
| 4 | // Need to ch eck that E ULA has be en accepte d | |
| 5 | if (_.isNull (App_Utils .GetLocalS torage('MH PRO_Eula') )) { | |
| 6 | MHPRO.La yout.modal .show(MHPR O.View.Eul a = new MH PRO.View.e ula()); | |
| 7 | MHPRO.Vi ew.Eula.sh ow(); | |
| 8 | } | |
| 9 | el se { App.v ent.trigge r('eula:ac cepted'); } | |
| 10 | }; | |
| 11 | App.lo adResource s = functi on () { | |
| 12 | va r ready = 0; | |
| 13 | va r readyChe ck = funct ion () { | |
| 14 | if (read y === 2) { // set to 2 | |
| 15 | App. vent.trigg er('resour ces:loaded '); | |
| 16 | } | |
| 17 | } | |
| 18 | va r successM ustStart = function () { | |
| 19 | MHPRO.Re sources.HA Resources = new MHPR O.Collecti on.HAResou rces(); | |
| 20 | MHPRO.Re sources.HA Resources. fetch({ su ccess: suc cessHandle r }); | |
| 21 | MHPRO.Re sources.MH PROResourc es = new M HPRO.Colle ction.MHPR OResources (); | |
| 22 | MHPRO.Re sources.MH PROResourc es.fetch({ success: successHan dler }); | |
| 23 | }; | |
| 24 | va r successH andler = f unction (c ollection, response, options) { | |
| 25 | ready++; | |
| 26 | readyChe ck(); | |
| 27 | }; | |
| 28 | MH PRO.Resour ces.App = new App_Re sources.Co llection.A ppResource s(MHPRO_Da ta.resourc e_director y.links); | |
| 29 | su ccessMustS tart(); | |
| 30 | }; | |
| 31 | ||
| 32 | App.lo ginOptions = functio n() { | |
| 33 | va r redirect Uri = (App .debug) ? 'http://lo calhost:40 00' : App_ Utils.GetD omainPath( )+"mhpro/" , | |
| 34 | options = { | |
| 35 | appN ame: 'mhpr o', | |
| 36 | auto Redirect: (App.debug ) ? false : true, /* do not auto direc t if in de bug mode u nless auth server al lows CORS */ | |
| 37 | redi rectUri: r edirectUri , | |
| 38 | reso urcesLink: App_Utils .GetDomain Path()+'mh proResourc es', | |
| 39 | auth orizeUrl: MHPRO.Reso urces.HARe sources.fi ndWhere({t itle:'oaut h-authoriz e'}).get(' href') | |
| 40 | }; | |
| 41 | re turn optio ns; | |
| 42 | }; | |
| 43 | ||
| 44 | App.on ('start', function ( ) { | |
| 45 | //App_Reso urces.host name = "ht tps:// DNS . URL /"; | |
| 46 | // App_Resour ces.hostna me = "http ://localho st:8080/"; | |
| 47 | MH PRO.Layout = new MHP RO.View.la yout(); | |
| 48 | MH PRO.Layout .render(); | |
| 49 | if (window.l ocation.hr ef.indexOf ("token") > -1) { | |
| 50 | App_Util s.SetSessi onToken('t oken', App _Utils.Get UrlParamet er('token' )); | |
| 51 | window.l ocation = App_Utils. SetUrl(); | |
| 52 | } | |
| 53 | el se { | |
| 54 | App.load Resources( ); | |
| 55 | } | |
| 56 | }); | |
| 57 | App.ve nt.on('eul a:accepted ', functio n () { | |
| 58 | MH PRO.Layout .header.sh ow(MHPRO.V iew.header = new MHP RO.View.He ader()); | |
| 59 | MH PRO.Layout .footer.sh ow(new MHP RO.View.fo oter()); | |
| 60 | MH PRO.Router = new MHP RO.Router( ); | |
| 61 | Ba ckbone.his tory.start (); | |
| 62 | // Set Author ize Reques t header | |
| 63 | Ap p_Utils.Se tRequestHe ader(); | |
| 64 | // Trigger ev ent to loa d user | |
| 65 | Ap p.vent.tri gger('load :user', { init: true }); | |
| 66 | }); | |
| 67 | ||
| 68 | App.ve nt.on('res ources:loa ded', func tion () { | |
| 69 | Ap p.loginUti ls = new L oginUtils( App.loginO ptions()); | |
| 70 | if (App_Util s.GetSessi onToken() != null) { | |
| 71 | App.chec kEula(); | |
| 72 | } | |
| 73 | el se { | |
| 74 | // App_Ut ils.Launch padLogin() ; | |
| 75 | App.lo ginUtils.c heckForAut hCode(); | |
| 76 | setTim eout(funct ion(){ | |
| 77 | if (App_Util s.GetSessi onToken()) { | |
| 78 | location .reload(tr ue) | |
| 79 | } | |
| 80 | }, 100 0); | |
| 81 | } | |
| 82 | }); | |
| 83 | ||
| 84 | App.ve nt.on('spi nner:start ', functio n(){ | |
| 85 | $('d iv.mask'). removeAttr ('aria-hid den').addC lass('load ing'); | |
| 86 | }); | |
| 87 | ||
| 88 | App.ve nt.on('spi nner:stop' , function (){ | |
| 89 | $('d iv.mask'). attr('aria -hidden', 'true').re moveClass( 'loading') ; | |
| 90 | }); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.