Home Explore Help
Register Sign In
Apq
/
violentmonkey
mirror of https://github.com/violentmonkey/violentmonkey.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

fixed editor support

Gerald 12 years ago
parent
b6ff24a225
commit
8302d26695
4 changed files with 30 additions and 27 deletions
Unified View Show Diff Stats
  1. 2 1
      confirm.html
  2. 4 10
      confirm.js
  3. 23 15
      editor.js
  4. 1 1
      options.js

+ 2 - 1
confirm.html
View File 

@@ -4,7 +4,7 @@
 
 		<meta http-equiv="content-type" content="text/html;charset=utf-8">
 
 		<meta http-equiv="content-type" content="text/html;charset=utf-8">
 
 		<link rel="stylesheet" type="text/css" href="style.css" />
 
 		<link rel="stylesheet" type="text/css" href="style.css" />
 
 		<link rel="shortcut icon" type="image/png" href="icons/icon_16.png" />
 
 		<link rel="shortcut icon" type="image/png" href="icons/icon_16.png" />
 
-		<script type="text/javascript" src="lib/src-min-noconflict/ace.js"></script>
 
+		<script type="text/javascript" src="load.js"></script>
 
 		<title class=i18n>extName</title>
 
 		<title class=i18n>extName</title>
 
 	</head>
 
 	</head>
 
 	<body class=fill>
 
 	<body class=fill>
 
@@ -24,4 +24,5 @@
 
 	</body>
 
 	</body>
 
 </html>
 
 </html>
 
 <script src=common.js></script>
 
 <script src=common.js></script>
 
+<script src="editor.js"></script>
 
 <script src=confirm.js></script>
 
 <script src=confirm.js></script>

+ 4 - 10
confirm.js
View File 

@@ -6,21 +6,15 @@ function checkScript(t){
 
 		});
 
 		});
 
 	} else {	// may be JS code
 
 	} else {	// may be JS code
 
 		M.innerHTML=_('msgLoadedJS',[data.url]);
 
 		M.innerHTML=_('msgLoadedJS',[data.url]);
 
-		T.setValue(t);T.gotoLine(0,0);
 
+		T.setValueAndFocus(t);
 
 		I.disabled=false;
 
 		I.disabled=false;
 
 	}
 
 	}
 
 }
 
 }
 
 var $=document.getElementById.bind(document),M=$('msg'),I=$('bInstall'),data={},
 
 var $=document.getElementById.bind(document),M=$('msg'),I=$('bInstall'),data={},
 
-		C=$('cClose'),T=ace.edit('eCode');
 
-T.setTheme('ace/theme/github');
 
-T.setReadOnly(true);
 
-(function(s){
 
-	s.setMode('ace/mode/javascript');
 
-	s.setUseWrapMode(true);
 
-	s.setUseWorker(true);
 
-})(T.getSession());
 
+		B=$('bClose'),C=$('cClose'),T;
 
 initCSS();initI18n();
 
 initCSS();initI18n();
 
-$('bClose').onclick=function(){window.close();};
 
+B.onclick=function(){window.close();};
 
+initEditor(function(o){T=o;},{exit:B.onclick,readonly:true});
 
 C.onchange=function(){
 
 C.onchange=function(){
 
 	chrome.runtime.sendMessage({cmd:'SetOption',data:{key:'closeAfterInstall',value:C.checked}});
 
 	chrome.runtime.sendMessage({cmd:'SetOption',data:{key:'closeAfterInstall',value:C.checked}});
 
 };
 
 };

+ 23 - 15
editor.js
View File 

@@ -1,4 +1,5 @@
 
-function initAce(callback){
 
+function initAce(callback,data){
 
+	data=data||{};
 
 	addScript({src:'lib/ace-min-noconflict/ace.js'},function(){
 
 	addScript({src:'lib/ace-min-noconflict/ace.js'},function(){
 
 		var T=ace.edit('eCode'),s=T.getSession();
 
 		var T=ace.edit('eCode'),s=T.getSession();
 
 		T.setTheme('ace/theme/github');
 
 		T.setTheme('ace/theme/github');
 
@@ -6,28 +7,30 @@ function initAce(callback){
 
 			T.setValue(v);T.focus();T.gotoLine(0,0);
 
 			T.setValue(v);T.focus();T.gotoLine(0,0);
 
 		};
 
 		};
 
 		s.setMode('ace/mode/javascript');
 
 		s.setMode('ace/mode/javascript');
 
-		s.on('change',E.markDirty);
 
 		s.setUseSoftTabs(false);
 
 		s.setUseSoftTabs(false);
 
 		s.setUseWrapMode(true);
 
 		s.setUseWrapMode(true);
 
 		s.setUseWorker(true);
 
 		s.setUseWorker(true);
 
 		T.clearHistory=s.getUndoManager().reset;
 
 		T.clearHistory=s.getUndoManager().reset;
 
-		T.commands.addCommand({
 
+		if(data.onchange) s.on('change',data.onchange);
 
+		if(data.save) T.commands.addCommand({
 
 			name:'Save',
 
 			name:'Save',
 
 			bindKey:{win:'Ctrl-S',mac:'Command-S'},
 
 			bindKey:{win:'Ctrl-S',mac:'Command-S'},
 
-			exec:eSave,
 
+			exec:data.save,
 
 			readOnly:false,
 
 			readOnly:false,
 
 		});
 
 		});
 
-		T.commands.addCommand({
 
+		if(data.exit) T.commands.addCommand({
 
 			name:'Exit',
 
 			name:'Exit',
 
 			bindKey:{win:'Esc'},
 
 			bindKey:{win:'Esc'},
 
-			exec:E.close,
 
+			exec:data.exit,
 
 			readOnly:true,
 
 			readOnly:true,
 
 		});
 
 		});
 
+		if(data.readonly) T.setReadOnly(data.readonly);
 
 		callback(T);
 
 		callback(T);
 
 	});
 
 	});
 
 }
 
 }
 
 
 
-function initCodeMirror(callback){
 
+function initCodeMirror(callback,data){
 
+	data=data||{};
 
 	addCSS([
 
 	addCSS([
 
 		{href:'lib/CodeMirror/lib/codemirror.css'},
 
 		{href:'lib/CodeMirror/lib/codemirror.css'},
 
 	]);
 
 	]);
 
@@ -41,13 +44,15 @@ function initCodeMirror(callback){
 
 			{src:'lib/CodeMirror/addon/search/searchcursor.js'},
 
 			{src:'lib/CodeMirror/addon/search/searchcursor.js'},
 
 			{src:'lib/CodeMirror/addon/selection/active-line.js'},
 
 			{src:'lib/CodeMirror/addon/selection/active-line.js'},
 
 		],function(){
 
 		],function(){
 
-			CodeMirror.keyMap.vm={
 
-				'Esc':'close',
 
-				'Ctrl-S':'save',
 
-				'fallthrough':'default'
 
-			};
 
-			CodeMirror.commands.save=eSave;
 
-			CodeMirror.commands.close=E.close;
 
+			CodeMirror.keyMap.vm={'fallthrough':'default'};
 
+			if(data.save) {
 
+				CodeMirror.keyMap.vm['Ctrl-S']='save';
 
+				CodeMirror.commands.save=data.save;
 
+			}
 
+			if(data.exit) {
 
+				CodeMirror.keyMap.vm['Esc']='exit';
 
+				CodeMirror.commands.exit=data.exit;
 
+			}
 
 			var T=CodeMirror($('eCode'),{
 
 			var T=CodeMirror($('eCode'),{
 
 				lineNumbers:true,
 
 				lineNumbers:true,
 
 				matchBrackets:true,
 
 				matchBrackets:true,
 
@@ -61,9 +66,12 @@ function initCodeMirror(callback){
 
 			});
 
 			});
 
 			T.clearHistory=function(){T.getDoc().clearHistory();};
 
 			T.clearHistory=function(){T.getDoc().clearHistory();};
 
 			T.setValueAndFocus=function(v){T.setValue(v);T.focus();};
 
 			T.setValueAndFocus=function(v){T.setValue(v);T.focus();};
 
-			T.on('change',E.markDirty);
 
 			T.getWrapperElement().setAttribute('style','position:absolute;height:100%;width:100%;');
 
 			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);
 
 			callback(T);
 
 		});
 
 		});
 
 	});
 
 	});
 
 }
 
 }
 
+
 
+var initEditor=initCodeMirror;

+ 1 - 1
options.js
View File 

@@ -289,7 +289,6 @@ var E=$('editor'),U=$('eUpdate'),M=$('meta'),
 
     mI=$('mInclude'),mE=$('mExclude'),mM=$('mMatch'),
 
     mI=$('mInclude'),mE=$('mExclude'),mM=$('mMatch'),
 
     cI=$('cInclude'),cE=$('cExclude'),cM=$('cMatch'),
 
     cI=$('cInclude'),cE=$('cExclude'),cM=$('cMatch'),
 
 		eS=$('eSave'),eSC=$('eSaveClose'),T;
 
 		eS=$('eSave'),eSC=$('eSaveClose'),T;
 
-initCodeMirror(function(o){T=o;});
 
 function markClean(){
 
 function markClean(){
 
 	T.clearHistory();
 
 	T.clearHistory();
 
 	eS.disabled=eSC.disabled=true;
 
 	eS.disabled=eSC.disabled=true;
 
@@ -365,6 +364,7 @@ $('mOK').onclick=function(){
 
 eS.onclick=eSave;
 
 eS.onclick=eSave;
 
 eSC.onclick=function(){eSave();eClose();};
 
 eSC.onclick=function(){eSave();eClose();};
 
 E.close=$('eClose').onclick=function(){if(confirmCancel(!eS.disabled)) eClose();};
 
 E.close=$('eClose').onclick=function(){if(confirmCancel(!eS.disabled)) eClose();};
 
+initEditor(function(o){T=o;},{save:eSave,exit:E.close,onchange:E.markDirty});
 
 
 
 // Load at last
 
 // Load at last
 
 var ids,map,cache;
 
 var ids,map,cache;