From 001bdc3ad706e4c28c48cbfcb0606595de4646d4 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 8 May 2018 18:53:24 +0300 Subject: [PATCH] [start page] fix bug 36884, fix bug 37678 --- common/loginpage/deploy/index.html | 8 ++++---- common/loginpage/src/dlglogin.js | 6 ++---- common/loginpage/src/panelabout.js | 2 +- common/loginpage/src/panelconnect.js | 12 +++++++++++- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/common/loginpage/deploy/index.html b/common/loginpage/deploy/index.html index d76ac852d..9062f6de2 100644 --- a/common/loginpage/deploy/index.html +++ b/common/loginpage/deploy/index.html @@ -158,8 +158,8 @@ .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(jQuery); - \ No newline at end of file + `,c="https://",b=void 0,e=void 0,f={},E=4,p=30;return{show:(d,f)=>{if(a=$("#placeholder").append(z).find(".dlg-login"),d){b=utils.skipUrlProtocol(d);let g=utils.getUrlProtocol(d);!!g&&(c=g)}!!f&&(e=f),a.width(450),a.find(".tool.close").bind("click",q),F(),a.get(0).showModal(),a.addClass("scaled"),a.on("close",j),x()},close:function(){j(0)},onclose:function(a){a&&(f.close=a)},onsuccess:function(a){a&&(f.success=a)},portalavailable:m}},$(document).ready(function(){$(".tool-menu").on("click","> .menu-item > a",onActionClick),$(".tool-quick-menu .menu-item a").click(onNewFileClick),!window.app&&(window.app={controller:{}}),!window.app.controller&&(window.app.controller={}),window.app.controller.recent=(new ControllerRecent).init(),window.app.controller.folders=(new ControllerFolders).init(),window.app.controller.about=(new ControllerAbout).init(),window.ControllerPortals&&(window.app.controller.portals=new ControllerPortals({}).init()),$("h3.createnew").text(utils.Lang.actCreateNew),$('a[action="new:docx"]').text(utils.Lang.newDoc),$('a[action="new:xlsx"]').text(utils.Lang.newXlsx),$('a[action="new:pptx"]').text(utils.Lang.newPptx),localStorage.welcome?selectAction("recent"):(app.controller.welcome=(new ControllerWelcome).init(),selectAction("welcome"),localStorage.setItem("welcome","have been")),$("#placeholder").on("click",".newportal",function(){CommonEvents.fire("portal:create")}),window.LoginDlg||($(".tools-connect").hide(),hideAction("connect")),utils.inParams.waitingloader||setLoaderVisible(!1),setTimeout((()=>{window.sdk&&(window.sdk.LocalFileRecovers(),window.sdk.LocalFileRecents(),window.sdk.execCommand("app:onready",""))}),50)});var OPEN_FILE_RECOVERY=1,OPEN_FILE_RECENT=2,OPEN_FILE_FOLDER=3,Scroll_offset="16px";window.sdk.on("on_native_message",function(cmd,param){if("portal:logout"==cmd);else if(/^panel\:(?:hide|show)/.test(cmd)){let hide=!/\:show/.test(cmd),panel=param;panel.length&&hideAction(panel,hide)}else/app\:ready/.test(cmd)&&setLoaderVisible(!1)}),document.getElementById("wrap").ondrop=function(e){return window.sdk.DropOfficeFiles(),e.preventDefault(),!1},document.getElementById("wrap").ondragover=function(e){return e.dataTransfer.dropEffect="copy",e.preventDefault(),!1},$(document).on("keydown",function(e){e.ctrlKey&&79==e.which&&$(".action-panel").filter(".recent, .open, .welcome").is(":visible")&&openFile(OPEN_FILE_FOLDER,"")}); \ No newline at end of file diff --git a/common/loginpage/src/dlglogin.js b/common/loginpage/src/dlglogin.js index 6a6fa2ccf..3c59a1dcf 100644 --- a/common/loginpage/src/dlglogin.js +++ b/common/loginpage/src/dlglogin.js @@ -376,9 +376,6 @@ window.LoginDlg = function() { return; } - var url = `${portal}/api/2.0/authentication.json`; - var check_url = `${portal}/api/2.0/people/@self.json`; - disableDialog(true); let _callback = (obj) => { @@ -714,7 +711,8 @@ window.LoginDlg = function() { onsuccess: function(callback) { if (!!callback) events.success = callback; - } + }, + portalavailable: requirePortalInfo }; }; diff --git a/common/loginpage/src/panelabout.js b/common/loginpage/src/panelabout.js index c5af03d6b..c3aefbe54 100644 --- a/common/loginpage/src/panelabout.js +++ b/common/loginpage/src/panelabout.js @@ -69,7 +69,7 @@ '
' + `

`+ `
${_opts.appname} ${_lang.strVersion} ${_opts.version}
${_opts.edition}

`+ - `${_lang.checkUpdates}

`+ + `${_lang.checkUpdates}

`+ `

${_opts.rights}
`+ `${_opts.site}`+ '
'+ diff --git a/common/loginpage/src/panelconnect.js b/common/loginpage/src/panelconnect.js index 0cda2f4c2..3a188972e 100644 --- a/common/loginpage/src/panelconnect.js +++ b/common/loginpage/src/panelconnect.js @@ -319,7 +319,17 @@ for (let i in obj) { let model = collection.find('name', i); - if (model) model.set('logged', obj[i].length > 0); + if (model) { + model.set('logged', false) + + let _is_logged = obj[i].length > 0; + if ( _is_logged ) { + let _dlg_login = new LoginDlg(); + _dlg_login.portalavailable(model.path).then( + data => { data.status == 'ok' && model.set('logged', true); }, + error => {}); + } + } }; };