Browse Source

Brushed it up a bit

rsredsq 10 years ago
parent
commit
1fd28ab0ca

+ 2 - 2
Resources/EditorData/AtomicEditor/Script/jsutils.js

@@ -1,6 +1,6 @@
 __atomic_acorn = require('./acorn');
 __atomic_acorn = require('./acorn');
 __atomic_beautify = require('./beautify');
 __atomic_beautify = require('./beautify');
-__atomic_sourceMapHelper = require('./source-map');
+__atomic_sourcemap = require('./source-map');
 
 
 exports.parseToJSON = function (source) {
 exports.parseToJSON = function (source) {
 
 
@@ -68,7 +68,7 @@ exports.jsBeautify = function (source) {
 
 
 exports.getRealLineNumber = function (map, line) {
 exports.getRealLineNumber = function (map, line) {
     var jsonMap = JSON.parse(map);
     var jsonMap = JSON.parse(map);
-    var smc = new __atomic_sourceMapHelper.SourceMapConsumer(jsonMap);
+    var smc = new __atomic_sourcemap.SourceMapConsumer(jsonMap);
     var pos = smc.originalPositionFor({line: line, column: 100000});
     var pos = smc.originalPositionFor({line: line, column: 100000});
     return pos.line;
     return pos.line;
 }
 }

File diff suppressed because it is too large
+ 0 - 8
Resources/EditorData/AtomicEditor/Script/source-map.js


+ 2 - 2
Source/AtomicEditor/Application/AEEditorApp.cpp

@@ -71,13 +71,13 @@ void AEEditorApp::Start()
 
 
     if (file.Null())
     if (file.Null())
     {
     {
-        ErrorExit("Unable to load AtomicEditor/main.js");
+        ErrorExit("Unable to load AtomicEditor/out/main.js");
         return;
         return;
     }
     }
 
 
     if (!vm_->ExecuteFile(file))
     if (!vm_->ExecuteFile(file))
     {
     {
-        ErrorExit("Error executing AtomicEditor/main.js");
+        ErrorExit("Error executing AtomicEditor/out/main.js");
         return;
         return;
     }
     }
 
 

Some files were not shown because too many files changed in this diff