diff --git a/cloudcmd.js b/cloudcmd.js index 254f29cb..2255df2f 100644 --- a/cloudcmd.js +++ b/cloudcmd.js @@ -276,8 +276,8 @@ else { p.name = INDEX_PATH, lPanel = CloudFunc.buildFromJSON(pJSON, FileTemplate, PathTemplate, LinkTemplate), - lList = '
' + lPanel + '
' + - ''; + lList = '
' + lPanel + '
' + + '
' + lPanel + '
'; main.sendResponse(p, indexProcessing({ additional : lList, diff --git a/css/style.css b/css/style.css index 41dd0125..1137c84d 100644 --- a/css/style.css +++ b/css/style.css @@ -31,7 +31,7 @@ body { background-color:white; } -.fm, #left>li, #right>li, .path, .fm-header, +.fm, .left>li, .right>li, .path, .fm-header, .mini-icon, .name, .size, .owner, .mode, .keyspanel, .cmd-button { -webkit-user-select : none; -moz-user-select : none; @@ -167,7 +167,7 @@ body { font-weight: bold; } -.left, #left { +.left { float:left; } @@ -180,7 +180,7 @@ body { color: rgb(254,159,224); } -.right, #right { +.right { float:right; } .panel { @@ -323,7 +323,7 @@ a:hover, a:active { width:94%; } /* если правая панель не помещаеться - прячем её */ - #right, .cmd-button#f5, .cmd-button#f6 { + .right, .cmd-button#f5, .cmd-button#f6 { display: none; } } diff --git a/lib/client.js b/lib/client.js index f811d0bd..e1de9136 100644 --- a/lib/client.js +++ b/lib/client.js @@ -453,7 +453,7 @@ var Util, DOM, CloudFunc; * используеться при первом заходе в корень */ function getJSONfromFileTable() { - var lLeft = DOM.getById('left'), + var lLeft = DOM.getById('js-left'), lPath = DOM.getByClass('path')[0].textContent, lFileTable = { diff --git a/lib/client/dom.js b/lib/client/dom.js index a15e3ece..20716c6f 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -1499,15 +1499,16 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; * @param pPanel_o = {active: true} */ this.getPanel = function(pActive) { - var files, panel, id, - current = this.getCurrentFile(); - files = current.parentElement; - panel = files.parentElement; + var id = 'js-', + current = this.getCurrentFile(), + files = current.parentElement, + panel = files.parentElement, + isLeft = DOM.isContainClass(panel, 'left'); /* if {active : false} getting passive panel */ if (pActive && !pActive.active) { - id = panel.id === 'left' ? 'right' : 'left'; - panel = this.getById(id); + id += isLeft ? 'right' : 'left'; + panel = this.getById(id); } /* if two panels showed @@ -1515,7 +1516,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; * panel */ if (window.innerWidth < CloudCmd.MIN_ONE_PANEL_WIDTH) - panel = this.getById('left'); + panel = this.getById('js-left'); if (!panel)