minor fix

editor.js

@@ -36,52 +36,51 @@ 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/javascript/javascript.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/match-highlighter.js'},
-			{src:'lib/CodeMirror/addon/search/searchcursor.js'},
-			{src:'lib/CodeMirror/addon/selection/active-line.js'},
-			{src:'mylib/CodeMirror/search.js'},
-		],function(){
-			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(document.getElementById('eCode'),{
-				continueComments:true,
-				matchBrackets:true,
-				autoCloseBrackets:true,
-				highlightSelectionMatches:true,
-				lineNumbers:true,
-				mode:'javascript',
-				lineWrapping:true,
-				indentUnit:4,
-				indentWithTabs:true,
-				keyMap:'vm',
-				styleActiveLine:true,
-				foldGutter:true,
-				gutters:['CodeMirror-linenumbers','CodeMirror-foldgutter'],
-			});
-			T.clearHistory=function(){T.getDoc().clearHistory();};
-			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/javascript/javascript.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/match-highlighter.js'},
+		{src:'lib/CodeMirror/addon/search/searchcursor.js'},
+		{src:'lib/CodeMirror/addon/selection/active-line.js'},
+		{src:'mylib/CodeMirror/search.js'},
+	],function(){
+		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(document.getElementById('eCode'),{
+			continueComments:true,
+			matchBrackets:true,
+			autoCloseBrackets:true,
+			highlightSelectionMatches:true,
+			lineNumbers:true,
+			mode:'javascript',
+			lineWrapping:true,
+			indentUnit:4,
+			indentWithTabs:true,
+			keyMap:'vm',
+			styleActiveLine:true,
+			foldGutter:true,
+			gutters:['CodeMirror-linenumbers','CodeMirror-foldgutter'],
 		});
+		T.clearHistory=function(){T.getDoc().clearHistory();};
+		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);
 	});
 }
 

load.js

@@ -1,6 +1,6 @@
 function addScript(data,callback){
 	function add(data){
-		var s=document.createElement('script');
+		var s=document.createElement('script');s.async=false;
 		if(data.innerHTML) s.innerHTML=data.innerHTML;
 		else if(data.src) s.src=data.src;
 		s.onload=finish;

popup.js

@@ -29,16 +29,18 @@ function menuCommand(e) {
 	chrome.tabs.sendMessage(tab.id,{cmd:'Command',data:e.target.cmd});
 }
 function menuScript(s) {
-	if(scripts[s.id]) return;scripts[s.id]=s;
-  var n=s.meta.name?s.meta.name.replace(/&/g,'&amp;').replace(/</g,'&lt;'):'<em>'+_('labelNoName')+'</em>';
-  loadItem(addItem(n,{
-    holder: pB,
-		symbol: '✓',
-    title: s.meta.name,
-    onclick: function(e){
-			chrome.runtime.sendMessage({cmd:'UpdateMeta',data:{id:s.id,enabled:loadItem(this,!this.data)?1:0}});
-    }
-  }),s.enabled);
+	if(s&&!scripts[s.id]) {
+		scripts[s.id]=s;
+		var n=s.meta.name?s.meta.name.replace(/&/g,'&amp;').replace(/</g,'&lt;'):'<em>'+_('labelNoName')+'</em>';
+		loadItem(addItem(n,{
+			holder: pB,
+			symbol: '✓',
+			title: s.meta.name,
+			onclick: function(e){
+				chrome.runtime.sendMessage({cmd:'UpdateMeta',data:{id:s.id,enabled:loadItem(this,!this.data)?1:0}});
+			}
+		}),s.enabled);
+	}
 }
 function initMenu(){
   addItem(_('menuManageScripts'),{