Преглед изворни кода

Use codeMirror lib via imports.

Herby Vojčík пре 5 година
родитељ
комит
f68d26d6ed
2 измењених фајлова са 6 додато и 35 уклоњено
  1. 4 27
      src/IDE.js
  2. 2 8
      src/IDE.st

+ 4 - 27
src/IDE.js

@@ -1299,7 +1299,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$self["@editor"] = $self._class()._codeMirror().fromTextArea(aTextarea, {
+$self["@editor"] = codeMirrorLib.fromTextArea(aTextarea, {
 		theme: "ide.codeMirrorTheme"._settingValueIfAbsent_("default"),
 		mode: "text/x-stsrc",
 		lineNumbers: true,
@@ -1316,7 +1316,7 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aTextarea"],
-source: "setEditorOn: aTextarea\x0a\x09<inlineJS: '$self[\x22@editor\x22] = $self._class()._codeMirror().fromTextArea(aTextarea, {\x0a\x09\x09theme: \x22ide.codeMirrorTheme\x22._settingValueIfAbsent_(\x22default\x22),\x0a\x09\x09mode: \x22text/x-stsrc\x22,\x0a\x09\x09lineNumbers: true,\x0a\x09\x09enterMode: \x22flat\x22,\x0a\x09\x09indentWithTabs: true,\x0a\x09\x09indentUnit: 4,\x0a\x09\x09matchBrackets: true,\x0a\x09\x09electricChars: false\x0a\x09})'>",
+source: "setEditorOn: aTextarea\x0a\x09<inlineJS: '$self[\x22@editor\x22] = codeMirrorLib.fromTextArea(aTextarea, {\x0a\x09\x09theme: \x22ide.codeMirrorTheme\x22._settingValueIfAbsent_(\x22default\x22),\x0a\x09\x09mode: \x22text/x-stsrc\x22,\x0a\x09\x09lineNumbers: true,\x0a\x09\x09enterMode: \x22flat\x22,\x0a\x09\x09indentWithTabs: true,\x0a\x09\x09indentUnit: 4,\x0a\x09\x09matchBrackets: true,\x0a\x09\x09electricChars: false\x0a\x09})'>",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
@@ -1371,29 +1371,6 @@ messageSends: ["setValue:"]
 $globals.SourceArea);
 
 
-$core.addMethod(
-$core.method({
-selector: "codeMirror",
-protocol: "accessing",
-fn: function (){
-var self=this,$self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-return $recv(require)._value_("codemirror/lib/codemirror");
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"codeMirror",{},$globals.SourceArea.a$cls)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "codeMirror\x0a\x09^ require value: 'codemirror/lib/codemirror'",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["value:"]
-}),
-$globals.SourceArea.a$cls);
-
 $core.addMethod(
 $core.method({
 selector: "initialize",
@@ -1435,7 +1412,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$self._codeMirror().keyMap["default"].fallthrough = ["basic"];
+codeMirrorLib.keyMap["default"].fallthrough = ["basic"];
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"setupCodeMirror",{},$globals.SourceArea.a$cls)});
@@ -1443,7 +1420,7 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "setupCodeMirror\x0a\x09<inlineJS: '$self._codeMirror().keyMap[\x22default\x22].fallthrough = [\x22basic\x22]'>",
+source: "setupCodeMirror\x0a\x09<inlineJS: 'codeMirrorLib.keyMap[\x22default\x22].fallthrough = [\x22basic\x22]'>",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []

+ 2 - 8
src/IDE.st

@@ -210,7 +210,7 @@ selection
 !
 
 setEditorOn: aTextarea
-	<inlineJS: '$self["@editor"] = $self._class()._codeMirror().fromTextArea(aTextarea, {
+	<inlineJS: '$self["@editor"] = codeMirrorLib.fromTextArea(aTextarea, {
 		theme: "ide.codeMirrorTheme"._settingValueIfAbsent_("default"),
 		mode: "text/x-stsrc",
 		lineNumbers: true,
@@ -328,12 +328,6 @@ renderOn: html
 	div onKeyDown: [ :e | self handleKeyDown: e ]
 ! !
 
-!SourceArea class methodsFor: 'accessing'!
-
-codeMirror
-	^ require value: 'codemirror/lib/codemirror'
-! !
-
 !SourceArea class methodsFor: 'initialization'!
 
 initialize
@@ -342,7 +336,7 @@ initialize
 !
 
 setupCodeMirror
-	<inlineJS: '$self._codeMirror().keyMap["default"].fallthrough = ["basic"]'>
+	<inlineJS: 'codeMirrorLib.keyMap["default"].fallthrough = ["basic"]'>
 ! !
 
 Widget subclass: #TabManager