Skip to content

Commit

Permalink
minor fix
Browse files Browse the repository at this point in the history
  • Loading branch information
gera2ld committed Apr 14, 2014
1 parent 197f7eb commit bb97d5b
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 37 deletions.
71 changes: 35 additions & 36 deletions editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,43 +23,42 @@ function initCodeMirror(callback,data){
{href:'mylib/CodeMirror/fold.css'},
{href:'mylib/CodeMirror/search.css'},
]);
addScript({src:'lib/CodeMirror/lib/codemirror.js'},function(){
addScript([
{src:'lib/CodeMirror/mode/css/css.js'},
{src:'lib/CodeMirror/addon/comment/continuecomment.js'},
{src:'lib/CodeMirror/addon/edit/matchbrackets.js'},
{src:'lib/CodeMirror/addon/edit/closebrackets.js'},
{src:'lib/CodeMirror/addon/fold/foldcode.js'},
{src:'lib/CodeMirror/addon/fold/foldgutter.js'},
{src:'lib/CodeMirror/addon/fold/brace-fold.js'},
{src:'lib/CodeMirror/addon/fold/comment-fold.js'},
{src:'lib/CodeMirror/addon/search/searchcursor.js'},
{src:'lib/CodeMirror/addon/search/match-highlighter.js'},
{src:'lib/CodeMirror/addon/selection/active-line.js'},
{src:'mylib/CodeMirror/search.js'},
],function(){
var T=CodeMirror(document.getElementById('mCode'),{
continueComments:true,
matchBrackets:true,
autoCloseBrackets:true,
highlightSelectionMatches:true,
lineNumbers:true,
mode:'text/css',
lineWrapping:true,
indentUnit:4,
indentWithTabs:true,
styleActiveLine:true,
foldGutter:true,
gutters:['CodeMirror-linenumbers','CodeMirror-foldgutter'],
});
T.clearHistory=function(){T.getDoc().clearHistory();};
T.setValue(' '); // fix CodeMirror for setting null string as value
T.setValueAndFocus=function(v){T.setValue(v);T.focus();};
T.getWrapperElement().setAttribute('style','position:absolute;height:100%;width:100%;');
if(data.onchange) T.on('change',data.onchange);
if(data.readonly) T.setOption('readOnly',data.readonly);
callback(T);
addScript([
{src:'lib/CodeMirror/lib/codemirror.js'},
{src:'lib/CodeMirror/mode/css/css.js'},
{src:'lib/CodeMirror/addon/comment/continuecomment.js'},
{src:'lib/CodeMirror/addon/edit/matchbrackets.js'},
{src:'lib/CodeMirror/addon/edit/closebrackets.js'},
{src:'lib/CodeMirror/addon/fold/foldcode.js'},
{src:'lib/CodeMirror/addon/fold/foldgutter.js'},
{src:'lib/CodeMirror/addon/fold/brace-fold.js'},
{src:'lib/CodeMirror/addon/fold/comment-fold.js'},
{src:'lib/CodeMirror/addon/search/searchcursor.js'},
{src:'lib/CodeMirror/addon/search/match-highlighter.js'},
{src:'lib/CodeMirror/addon/selection/active-line.js'},
{src:'mylib/CodeMirror/search.js'},
],function(){
var T=CodeMirror(document.getElementById('mCode'),{
continueComments:true,
matchBrackets:true,
autoCloseBrackets:true,
highlightSelectionMatches:true,
lineNumbers:true,
mode:'text/css',
lineWrapping:true,
indentUnit:4,
indentWithTabs:true,
styleActiveLine:true,
foldGutter:true,
gutters:['CodeMirror-linenumbers','CodeMirror-foldgutter'],
});
T.clearHistory=function(){T.getDoc().clearHistory();};
T.setValue(' '); // fix CodeMirror for setting null string as value
T.setValueAndFocus=function(v){T.setValue(v);T.focus();};
T.getWrapperElement().setAttribute('style','position:absolute;height:100%;width:100%;');
if(data.onchange) T.on('change',data.onchange);
if(data.readonly) T.setOption('readOnly',data.readonly);
callback(T);
});
}

Expand Down
2 changes: 1 addition & 1 deletion options.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ function impo(b){
// Export
var xL=$('#xList'),xE=$('#bExport'),xF=$('#cFirefox');
function xLoad() {
xL.innerHTML='';xE.disabled=false;
xL.innerHTML='';
xF.checked=bg.settings.firefoxCSS;
bg.ids.forEach(function(i){
var d=document.createElement('div');
Expand Down

0 comments on commit bb97d5b

Please sign in to comment.