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 | provider.js | Wed Dec 20 15:17:09 2017 UTC |
| 2 | MHPRO_v1.x.zip\mhpro-web-master@18b10e0e051.zip\app\common\js | provider.js | Mon Feb 4 15:06:51 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 196 |
| 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.A pp = new M HPRO.App({ container: "div.cont ainer-flui d"}); | |
| 3 | ||
| 4 | App.chec kEula = fu nction () { | |
| 5 | //Ne ed to chec k that EUL A has been accepted | |
| 6 | if ( _.isNull(A pp_Utils.G etLocalSto rage('MHPR O_Eula'))) { | |
| 7 | MHPRO.Layo ut.modal.s how(MHPRO. View.Eula = new MHPR O.View.eul a()); | |
| 8 | MHPRO.View .Eula.show (); | |
| 9 | } | |
| 10 | else { App.ven t.trigger( 'eula:acce pted'); } | |
| 11 | }; | |
| 12 | ||
| 13 | App.load Resources = function () { | |
| 14 | var ready = 0; | |
| 15 | var readyCheck = functio n () { | |
| 16 | if (ready === 3) { / / set to 3 | |
| 17 | App.ve nt.trigger ('resource s:loaded') ; | |
| 18 | } | |
| 19 | } | |
| 20 | var successMus tStart = f unction(){ | |
| 21 | MHPRO.Reso urces.HARe sources = new MHPRO. Collection .HAResourc es(); | |
| 22 | MHPRO.Reso urces.HARe sources.fe tch({succe ss: succes sHandler}) ; | |
| 23 | ||
| 24 | MHPRO.Reso urces.PVSR esources = new MHPRO .Collectio n.PVSResou rces; | |
| 25 | MHPRO.Reso urces.PVSR esources.f etch({succ ess: succe ssHandler} ); | |
| 26 | ||
| 27 | MHPRO.Reso urces.MHPR OResources = new MHP RO.Collect ion.MHPROR esources() ; | |
| 28 | MHPRO.Reso urces.MHPR OResources .fetch({su ccess: suc cessHandle r}); | |
| 29 | }; | |
| 30 | var successHan dler = fun ction (col lection, r esponse, o ptions) { | |
| 31 | ready++; | |
| 32 | readyCheck (); | |
| 33 | }; | |
| 34 | MHPR O.Resource s.App = ne w App_Reso urces.Coll ection.App Resources( MHPRO_Data .resource_ directory. links); | |
| 35 | succ essMustSta rt(); | |
| 36 | }; | |
| 37 | ||
| 38 | App.logi nOptions = function( ) { | |
| 39 | var redirectUr i = (App.d ebug) ? 'h ttp://loca lhost:4000 ' : App_Ut ils.GetDom ainPath()+ "mhpro/", | |
| 40 | options = { | |
| 41 | appNam e: 'mhpro' , | |
| 42 | autoRe direct: (A pp.debug) ? false : true, /* do not au to direct if in debu g mode unl ess auth s erver allo ws CORS * / | |
| 43 | redire ctUri: red irectUri, | |
| 44 | resour cesLink: A pp_Utils.G etDomainPa th()+'mhpr oResources ', | |
| 45 | author izeUrl: MH PRO.Resour ces.HAReso urces.find Where({tit le:'oauth- authorize' }).get('hr ef') | |
| 46 | }; | |
| 47 | retu rn options ; | |
| 48 | }; | |
| 49 | ||
| 50 | App.on(' start', fu nction () { | |
| 51 | //App_Reso urces.host name = "ht tps:// DNS . URL /"; | |
| 52 | // App _Resources .hostname = "http:// localhost: 8080/"; | |
| 53 | MHPRO. Layout = n ew MHPRO.V iew.layout (); | |
| 54 | MHPRO. Layout.ren der(); | |
| 55 | if (wi ndow.locat ion.href.i ndexOf("to ken") > -1 ) { | |
| 56 | Ap p_Utils.Se tSessionTo ken('token ', App_Uti ls.GetUrlP arameter(' token')); | |
| 57 | wi ndow.locat ion = App_ Utils.SetU rl(); | |
| 58 | } | |
| 59 | else { | |
| 60 | Ap p.loadReso urces(); | |
| 61 | } | |
| 62 | }); | |
| 63 | ||
| 64 | App.vent .on('eula: accepted', function () { | |
| 65 | MHPR O.Layout.h eader.show (MHPRO.Vie w.header = new MHPRO .View.Head er()); | |
| 66 | MHPR O.Layout.f ooter.show (new MHPRO .View.foot er()); | |
| 67 | MHPR O.Router = new MHPRO .Router(); | |
| 68 | Back bone.histo ry.start() ; | |
| 69 | //Se t Authoriz e Request header | |
| 70 | App_ Utils.SetR equestHead er(); | |
| 71 | //Tr igger even t to load user | |
| 72 | App. vent.trigg er('load:u ser', { in it: true } ); | |
| 73 | }); | |
| 74 | ||
| 75 | App.vent .on('resou rces:loade d', functi on () { | |
| 76 | App. loginUtils = new Log inUtils(Ap p.loginOpt ions()); | |
| 77 | if ( App_Utils. GetSession Token() != null) { | |
| 78 | App.checkE ula(); | |
| 79 | } | |
| 80 | else { | |
| 81 | // App_Util s.Launchpa dLogin(); | |
| 82 | ||
| 83 | App.logi nUtils.che ckForAuthC ode(); | |
| 84 | setTimeo ut(functio n(){ | |
| 85 | if ( App_Utils. GetSession Token()) { | |
| 86 | location.r eload(true ) | |
| 87 | } | |
| 88 | }, 1000) ; | |
| 89 | ||
| 90 | } | |
| 91 | }); | |
| 92 | ||
| 93 | App.vent .on('spinn er:start', function( ){ | |
| 94 | $('div .mask').re moveAttr(' aria-hidde n').addCla ss('loadin g'); | |
| 95 | }); | |
| 96 | ||
| 97 | App.vent .on('spinn er:stop', function() { | |
| 98 | $('div .mask').at tr('aria-h idden', 't rue').remo veClass('l oading'); | |
| 99 | }); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.