mirror of
https://github.com/coderaiser/cloudcmd.git
synced 2026-07-18 17:05:17 +00:00
fixed bug with positioning of CodeMirror on the right panel
This commit is contained in:
parent
f1bd86ad84
commit
84bd6ef3f6
2 changed files with 34 additions and 21 deletions
|
|
@ -701,11 +701,20 @@ var CloudCommander, $, Util, DOM, CloudFunc;
|
|||
return lRet;
|
||||
};
|
||||
|
||||
DOM.hide = function(pElement){
|
||||
DOM.hide = function(pElement){
|
||||
return DOM.addClass(pElement, 'hidden');
|
||||
};
|
||||
|
||||
DOM.removeClass = function(pElement, pClass){
|
||||
/**
|
||||
* remove child of element
|
||||
* @pChild
|
||||
* @pElement
|
||||
*/
|
||||
DOM.remove = function(pChild, pElement){
|
||||
return (pElement || document.body).removeChild(pChild);
|
||||
};
|
||||
|
||||
DOM.removeClass = function(pElement, pClass){
|
||||
var lRet_b = true,
|
||||
lClassList = pElement.classList;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,25 @@ var CloudCommander, Util, DOM, CloudFunc, CodeMirror;
|
|||
|
||||
/* private functions */
|
||||
|
||||
function setCSS(){
|
||||
return DOM.cssSet({
|
||||
id : 'editor',
|
||||
inner : '.CodeMirror{' +
|
||||
'font-family' + ': \'Droid Sans Mono\';' +
|
||||
'font-size' + ': 15px;' +
|
||||
/* codemirror v3 */
|
||||
//'height : ' + cloudcmd.HEIGHT + 'px' +
|
||||
'}' +
|
||||
'.CodeMirror-scroll{' +
|
||||
'height' + ':' + cloudcmd.HEIGHT + 'px' +
|
||||
'}' +
|
||||
'#CodeMirrorEditor{' +
|
||||
'float' + ':' + DOM.getPanel().id +
|
||||
// 'padding :20px 20px 20px 20px;' +
|
||||
'}'
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* function initialize CodeMirror
|
||||
* @param {value, callback}
|
||||
|
|
@ -31,6 +50,8 @@ var CloudCommander, Util, DOM, CloudFunc, CodeMirror;
|
|||
if(!FM)
|
||||
FM = DOM.getFM();
|
||||
|
||||
var lCSS = setCSS();
|
||||
|
||||
CodeMirrorElement = DOM.anyload({
|
||||
name : 'div',
|
||||
id : 'CodeMirrorEditor',
|
||||
|
|
@ -49,6 +70,7 @@ var CloudCommander, Util, DOM, CloudFunc, CodeMirror;
|
|||
extraKeys: {
|
||||
//Сохранение
|
||||
'Esc': function(){
|
||||
DOM.remove(lCSS, document.head);
|
||||
Util.exec(pData.callback);
|
||||
}
|
||||
},
|
||||
|
|
@ -63,25 +85,7 @@ var CloudCommander, Util, DOM, CloudFunc, CodeMirror;
|
|||
console.time('codemirror load');
|
||||
var lDir = cloudcmd.LIBDIRCLIENT + 'editor/codemirror/';
|
||||
|
||||
DOM.anyLoadOnLoad(
|
||||
[{
|
||||
name: 'style',
|
||||
id:'editor',
|
||||
inner : '.CodeMirror{' +
|
||||
'font-family :\'Droid Sans Mono\';' +
|
||||
'font-size :15px;' +
|
||||
/* codemirror v3 */
|
||||
//'height : ' + cloudcmd.HEIGHT + 'px' +
|
||||
'}' +
|
||||
'.CodeMirror-scroll{' +
|
||||
'height : ' + cloudcmd.HEIGHT + 'px' +
|
||||
'}' +
|
||||
'#CodeMirrorEditor{' +
|
||||
'float: right' +
|
||||
// 'padding :20px 20px 20px 20px;' +
|
||||
'}',
|
||||
parent: document.head
|
||||
},
|
||||
DOM.anyLoadOnLoad([
|
||||
lDir + 'codemirror.css',
|
||||
lDir + 'theme/night.css',
|
||||
lDir + 'mode/javascript.js',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue