diff --git a/Cocoa/.gitignore b/Cocoa/.gitignore new file mode 100644 index 000000000..64c810809 --- /dev/null +++ b/Cocoa/.gitignore @@ -0,0 +1,16 @@ +# Xcode +build/* +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +*.xcworkspace +!default.xcworkspace +xcuserdata +profile +*.moved-aside + diff --git a/APPL.icns b/Cocoa/APPL.icns similarity index 100% rename from APPL.icns rename to Cocoa/APPL.icns diff --git a/Atomicity-Info.plist b/Cocoa/Atomicity-Info.plist similarity index 100% rename from Atomicity-Info.plist rename to Cocoa/Atomicity-Info.plist diff --git a/Atomicity.xcodeproj/project.pbxproj b/Cocoa/Atomicity.xcodeproj/project.pbxproj similarity index 60% rename from Atomicity.xcodeproj/project.pbxproj rename to Cocoa/Atomicity.xcodeproj/project.pbxproj index 777a540b4..b5b294815 100644 --- a/Atomicity.xcodeproj/project.pbxproj +++ b/Cocoa/Atomicity.xcodeproj/project.pbxproj @@ -7,59 +7,62 @@ objects = { /* Begin PBXBuildFile section */ - 044A1F0314080A510006B340 /* class.js in Resources */ = {isa = PBXBuildFile; fileRef = 8359A6FA13FE270F00AC37E3 /* class.js */; }; - 044A1F0514080A540006B340 /* jslint-jscocoa.js in Resources */ = {isa = PBXBuildFile; fileRef = 8359A72113FE270F00AC37E3 /* jslint-jscocoa.js */; }; - 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; }; - 8321C5F11404ADE60029952E /* AtomWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8321C5F01404ADE60029952E /* AtomWindow.xib */; }; - 8321C5F61404ADF00029952E /* AtomicityAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8321C5F31404ADF00029952E /* AtomicityAppDelegate.m */; }; - 8321C5F71404ADF00029952E /* AtomWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8321C5F51404ADF00029952E /* AtomWindowController.m */; }; - 8321C5FB1404AE0C0029952E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8321C5FA1404AE0C0029952E /* main.m */; }; - 832BA38413FE674C00516BD7 /* APPL.icns in Resources */ = {isa = PBXBuildFile; fileRef = 832BA38313FE674C00516BD7 /* APPL.icns */; }; 83599F9B13FE0F8400AC37E3 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83599F9A13FE0F8400AC37E3 /* WebKit.framework */; }; 8359A6EE13FE26DA00AC37E3 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8359A6ED13FE26DA00AC37E3 /* JavaScriptCore.framework */; }; - 8359A72213FE270F00AC37E3 /* BridgeSupportController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8359A6F913FE270F00AC37E3 /* BridgeSupportController.m */; }; - 8359A72F13FE270F00AC37E3 /* JSCocoaController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8359A71813FE270F00AC37E3 /* JSCocoaController.m */; }; - 8359A73013FE270F00AC37E3 /* JSCocoaFFIArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = 8359A71A13FE270F00AC37E3 /* JSCocoaFFIArgument.m */; }; - 8359A73113FE270F00AC37E3 /* JSCocoaFFIClosure.m in Sources */ = {isa = PBXBuildFile; fileRef = 8359A71C13FE270F00AC37E3 /* JSCocoaFFIClosure.m */; }; - 8359A73213FE270F00AC37E3 /* JSCocoaLib.m in Sources */ = {isa = PBXBuildFile; fileRef = 8359A71E13FE270F00AC37E3 /* JSCocoaLib.m */; }; - 8359A73313FE270F00AC37E3 /* JSCocoaPrivateObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 8359A72013FE270F00AC37E3 /* JSCocoaPrivateObject.m */; }; - 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; + 837D8BA81408FAAA009B6DFA /* AtomicityAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BA51408FAAA009B6DFA /* AtomicityAppDelegate.m */; }; + 837D8BA91408FAAA009B6DFA /* AtomWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BA71408FAAA009B6DFA /* AtomWindowController.m */; }; + 837D8BAC1408FAB4009B6DFA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BAB1408FAB4009B6DFA /* main.m */; }; + 837D8BB41408FAC3009B6DFA /* APPL.icns in Resources */ = {isa = PBXBuildFile; fileRef = 837D8BAD1408FAC3009B6DFA /* APPL.icns */; }; + 837D8BB51408FAC3009B6DFA /* Atomicity-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 837D8BAE1408FAC3009B6DFA /* Atomicity-Info.plist */; }; + 837D8BB61408FAC3009B6DFA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 837D8BB01408FAC3009B6DFA /* InfoPlist.strings */; }; + 837D8BB71408FAC3009B6DFA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 837D8BB21408FAC3009B6DFA /* MainMenu.xib */; }; + 837D8BD51408FAD4009B6DFA /* BridgeSupportController.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BC71408FAD4009B6DFA /* BridgeSupportController.m */; }; + 837D8BD61408FAD4009B6DFA /* class.js in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BC81408FAD4009B6DFA /* class.js */; }; + 837D8BD71408FAD4009B6DFA /* JSCocoaController.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BCB1408FAD4009B6DFA /* JSCocoaController.m */; }; + 837D8BD81408FAD4009B6DFA /* JSCocoaFFIArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BCD1408FAD4009B6DFA /* JSCocoaFFIArgument.m */; }; + 837D8BD91408FAD4009B6DFA /* JSCocoaFFIClosure.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BCF1408FAD4009B6DFA /* JSCocoaFFIClosure.m */; }; + 837D8BDA1408FAD4009B6DFA /* JSCocoaLib.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BD11408FAD4009B6DFA /* JSCocoaLib.m */; }; + 837D8BDB1408FAD4009B6DFA /* JSCocoaPrivateObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BD31408FAD4009B6DFA /* JSCocoaPrivateObject.m */; }; + 837D8BDC1408FAD4009B6DFA /* jslint-jscocoa.js in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BD41408FAD4009B6DFA /* jslint-jscocoa.js */; }; + 837D8BE11408FAF5009B6DFA /* AtomWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 837D8BE01408FAF5009B6DFA /* AtomWindow.xib */; }; + 837D8BE91408FB15009B6DFA /* Rakefile in Resources */ = {isa = PBXBuildFile; fileRef = 837D8BE81408FB15009B6DFA /* Rakefile */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; - 1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; - 256AC3F00F4B6AF500CF3369 /* Atomicity_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Atomicity_Prefix.pch; sourceTree = ""; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; - 8321C5F01404ADE60029952E /* AtomWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = AtomWindow.xib; path = ../Atomicity/xibs/AtomWindow.xib; sourceTree = SOURCE_ROOT; }; - 8321C5F21404ADF00029952E /* AtomicityAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AtomicityAppDelegate.h; path = ../Atomicity/Classes/AtomicityAppDelegate.h; sourceTree = SOURCE_ROOT; }; - 8321C5F31404ADF00029952E /* AtomicityAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AtomicityAppDelegate.m; path = ../Atomicity/Classes/AtomicityAppDelegate.m; sourceTree = SOURCE_ROOT; }; - 8321C5F41404ADF00029952E /* AtomWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AtomWindowController.h; path = ../Atomicity/Classes/AtomWindowController.h; sourceTree = SOURCE_ROOT; }; - 8321C5F51404ADF00029952E /* AtomWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AtomWindowController.m; path = ../Atomicity/Classes/AtomWindowController.m; sourceTree = SOURCE_ROOT; }; - 8321C5FA1404AE0C0029952E /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ../Atomicity/main.m; sourceTree = SOURCE_ROOT; }; - 832BA38313FE674C00516BD7 /* APPL.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = APPL.icns; sourceTree = ""; }; 83599F9A13FE0F8400AC37E3 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; 8359A6ED13FE26DA00AC37E3 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; - 8359A6F813FE270F00AC37E3 /* BridgeSupportController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BridgeSupportController.h; sourceTree = ""; }; - 8359A6F913FE270F00AC37E3 /* BridgeSupportController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BridgeSupportController.m; sourceTree = ""; }; - 8359A6FA13FE270F00AC37E3 /* class.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = class.js; sourceTree = ""; }; - 8359A71313FE270F00AC37E3 /* JSCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoa.h; sourceTree = ""; }; - 8359A71713FE270F00AC37E3 /* JSCocoaController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaController.h; sourceTree = ""; }; - 8359A71813FE270F00AC37E3 /* JSCocoaController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaController.m; sourceTree = ""; }; - 8359A71913FE270F00AC37E3 /* JSCocoaFFIArgument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaFFIArgument.h; sourceTree = ""; }; - 8359A71A13FE270F00AC37E3 /* JSCocoaFFIArgument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaFFIArgument.m; sourceTree = ""; }; - 8359A71B13FE270F00AC37E3 /* JSCocoaFFIClosure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaFFIClosure.h; sourceTree = ""; }; - 8359A71C13FE270F00AC37E3 /* JSCocoaFFIClosure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaFFIClosure.m; sourceTree = ""; }; - 8359A71D13FE270F00AC37E3 /* JSCocoaLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaLib.h; sourceTree = ""; }; - 8359A71E13FE270F00AC37E3 /* JSCocoaLib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaLib.m; sourceTree = ""; }; - 8359A71F13FE270F00AC37E3 /* JSCocoaPrivateObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaPrivateObject.h; sourceTree = ""; }; - 8359A72013FE270F00AC37E3 /* JSCocoaPrivateObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaPrivateObject.m; sourceTree = ""; }; - 8359A72113FE270F00AC37E3 /* jslint-jscocoa.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "jslint-jscocoa.js"; sourceTree = ""; }; - 8D1107310486CEB800E47090 /* Atomicity-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Atomicity-Info.plist"; sourceTree = ""; }; + 837D8BA41408FAAA009B6DFA /* AtomicityAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AtomicityAppDelegate.h; path = ../../Atomicity/Cocoa/Classes/AtomicityAppDelegate.h; sourceTree = SOURCE_ROOT; }; + 837D8BA51408FAAA009B6DFA /* AtomicityAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AtomicityAppDelegate.m; path = ../../Atomicity/Cocoa/Classes/AtomicityAppDelegate.m; sourceTree = SOURCE_ROOT; }; + 837D8BA61408FAAA009B6DFA /* AtomWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AtomWindowController.h; path = ../../Atomicity/Cocoa/Classes/AtomWindowController.h; sourceTree = SOURCE_ROOT; }; + 837D8BA71408FAAA009B6DFA /* AtomWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AtomWindowController.m; path = ../../Atomicity/Cocoa/Classes/AtomWindowController.m; sourceTree = SOURCE_ROOT; }; + 837D8BAA1408FAB4009B6DFA /* Atomicity_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Atomicity_Prefix.pch; path = ../../Atomicity/Cocoa/Atomicity_Prefix.pch; sourceTree = SOURCE_ROOT; }; + 837D8BAB1408FAB4009B6DFA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ../../Atomicity/Cocoa/main.m; sourceTree = SOURCE_ROOT; }; + 837D8BAD1408FAC3009B6DFA /* APPL.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = APPL.icns; path = ../../Atomicity/Cocoa/APPL.icns; sourceTree = SOURCE_ROOT; }; + 837D8BAE1408FAC3009B6DFA /* Atomicity-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Atomicity-Info.plist"; path = "../../Atomicity/Cocoa/Atomicity-Info.plist"; sourceTree = SOURCE_ROOT; }; + 837D8BB11408FAC3009B6DFA /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = ""; }; + 837D8BB31408FAC3009B6DFA /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = MainMenu.xib; sourceTree = ""; }; + 837D8BC61408FAD4009B6DFA /* BridgeSupportController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BridgeSupportController.h; sourceTree = ""; }; + 837D8BC71408FAD4009B6DFA /* BridgeSupportController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BridgeSupportController.m; sourceTree = ""; }; + 837D8BC81408FAD4009B6DFA /* class.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = class.js; sourceTree = ""; }; + 837D8BC91408FAD4009B6DFA /* JSCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoa.h; sourceTree = ""; }; + 837D8BCA1408FAD4009B6DFA /* JSCocoaController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaController.h; sourceTree = ""; }; + 837D8BCB1408FAD4009B6DFA /* JSCocoaController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaController.m; sourceTree = ""; }; + 837D8BCC1408FAD4009B6DFA /* JSCocoaFFIArgument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaFFIArgument.h; sourceTree = ""; }; + 837D8BCD1408FAD4009B6DFA /* JSCocoaFFIArgument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaFFIArgument.m; sourceTree = ""; }; + 837D8BCE1408FAD4009B6DFA /* JSCocoaFFIClosure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaFFIClosure.h; sourceTree = ""; }; + 837D8BCF1408FAD4009B6DFA /* JSCocoaFFIClosure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaFFIClosure.m; sourceTree = ""; }; + 837D8BD01408FAD4009B6DFA /* JSCocoaLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaLib.h; sourceTree = ""; }; + 837D8BD11408FAD4009B6DFA /* JSCocoaLib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaLib.m; sourceTree = ""; }; + 837D8BD21408FAD4009B6DFA /* JSCocoaPrivateObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaPrivateObject.h; sourceTree = ""; }; + 837D8BD31408FAD4009B6DFA /* JSCocoaPrivateObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaPrivateObject.m; sourceTree = ""; }; + 837D8BD41408FAD4009B6DFA /* jslint-jscocoa.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "jslint-jscocoa.js"; sourceTree = ""; }; + 837D8BE01408FAF5009B6DFA /* AtomWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = AtomWindow.xib; path = ../../Atomicity/Cocoa/xibs/AtomWindow.xib; sourceTree = SOURCE_ROOT; }; + 837D8BE81408FB15009B6DFA /* Rakefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Rakefile; path = ../../Atomicity/Rakefile; sourceTree = SOURCE_ROOT; }; 8D1107320486CEB800E47090 /* Atomicity.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Atomicity.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -80,10 +83,10 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( - 8321C5F21404ADF00029952E /* AtomicityAppDelegate.h */, - 8321C5F31404ADF00029952E /* AtomicityAppDelegate.m */, - 8321C5F41404ADF00029952E /* AtomWindowController.h */, - 8321C5F51404ADF00029952E /* AtomWindowController.m */, + 837D8BA41408FAAA009B6DFA /* AtomicityAppDelegate.h */, + 837D8BA51408FAAA009B6DFA /* AtomicityAppDelegate.m */, + 837D8BA61408FAAA009B6DFA /* AtomWindowController.h */, + 837D8BA71408FAAA009B6DFA /* AtomWindowController.m */, 29B97315FDCFA39411CA2CEA /* Other Sources */, ); name = Classes; @@ -122,7 +125,7 @@ children = ( 080E96DDFE201D6D7F000001 /* Classes */, 29B97317FDCFA39411CA2CEA /* Resources */, - 8359A6F713FE270F00AC37E3 /* JSCocoa */, + 837D8BC51408FAD4009B6DFA /* JSCocoa */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, ); @@ -132,8 +135,9 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( - 256AC3F00F4B6AF500CF3369 /* Atomicity_Prefix.pch */, - 8321C5FA1404AE0C0029952E /* main.m */, + 837D8BE81408FB15009B6DFA /* Rakefile */, + 837D8BAA1408FAB4009B6DFA /* Atomicity_Prefix.pch */, + 837D8BAB1408FAB4009B6DFA /* main.m */, ); name = "Other Sources"; sourceTree = ""; @@ -141,11 +145,11 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( - 832BA38313FE674C00516BD7 /* APPL.icns */, - 8D1107310486CEB800E47090 /* Atomicity-Info.plist */, - 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, - 1DDD58140DA1D0A300B32029 /* MainMenu.xib */, - 8321C5F01404ADE60029952E /* AtomWindow.xib */, + 837D8BAD1408FAC3009B6DFA /* APPL.icns */, + 837D8BAE1408FAC3009B6DFA /* Atomicity-Info.plist */, + 837D8BB01408FAC3009B6DFA /* InfoPlist.strings */, + 837D8BE01408FAF5009B6DFA /* AtomWindow.xib */, + 837D8BB21408FAC3009B6DFA /* MainMenu.xib */, ); name = Resources; sourceTree = ""; @@ -159,27 +163,28 @@ name = Frameworks; sourceTree = ""; }; - 8359A6F713FE270F00AC37E3 /* JSCocoa */ = { + 837D8BC51408FAD4009B6DFA /* JSCocoa */ = { isa = PBXGroup; children = ( - 8359A6F813FE270F00AC37E3 /* BridgeSupportController.h */, - 8359A6F913FE270F00AC37E3 /* BridgeSupportController.m */, - 8359A6FA13FE270F00AC37E3 /* class.js */, - 8359A71313FE270F00AC37E3 /* JSCocoa.h */, - 8359A71713FE270F00AC37E3 /* JSCocoaController.h */, - 8359A71813FE270F00AC37E3 /* JSCocoaController.m */, - 8359A71913FE270F00AC37E3 /* JSCocoaFFIArgument.h */, - 8359A71A13FE270F00AC37E3 /* JSCocoaFFIArgument.m */, - 8359A71B13FE270F00AC37E3 /* JSCocoaFFIClosure.h */, - 8359A71C13FE270F00AC37E3 /* JSCocoaFFIClosure.m */, - 8359A71D13FE270F00AC37E3 /* JSCocoaLib.h */, - 8359A71E13FE270F00AC37E3 /* JSCocoaLib.m */, - 8359A71F13FE270F00AC37E3 /* JSCocoaPrivateObject.h */, - 8359A72013FE270F00AC37E3 /* JSCocoaPrivateObject.m */, - 8359A72113FE270F00AC37E3 /* jslint-jscocoa.js */, + 837D8BC61408FAD4009B6DFA /* BridgeSupportController.h */, + 837D8BC71408FAD4009B6DFA /* BridgeSupportController.m */, + 837D8BC81408FAD4009B6DFA /* class.js */, + 837D8BC91408FAD4009B6DFA /* JSCocoa.h */, + 837D8BCA1408FAD4009B6DFA /* JSCocoaController.h */, + 837D8BCB1408FAD4009B6DFA /* JSCocoaController.m */, + 837D8BCC1408FAD4009B6DFA /* JSCocoaFFIArgument.h */, + 837D8BCD1408FAD4009B6DFA /* JSCocoaFFIArgument.m */, + 837D8BCE1408FAD4009B6DFA /* JSCocoaFFIClosure.h */, + 837D8BCF1408FAD4009B6DFA /* JSCocoaFFIClosure.m */, + 837D8BD01408FAD4009B6DFA /* JSCocoaLib.h */, + 837D8BD11408FAD4009B6DFA /* JSCocoaLib.m */, + 837D8BD21408FAD4009B6DFA /* JSCocoaPrivateObject.h */, + 837D8BD31408FAD4009B6DFA /* JSCocoaPrivateObject.m */, + 837D8BD41408FAD4009B6DFA /* jslint-jscocoa.js */, ); - path = JSCocoa; - sourceTree = ""; + name = JSCocoa; + path = ../../Atomicity/Cocoa/JSCocoa; + sourceTree = SOURCE_ROOT; }; /* End PBXGroup section */ @@ -220,7 +225,7 @@ ); mainGroup = 29B97314FDCFA39411CA2CEA /* Atomicity */; projectDirPath = ""; - projectRoot = ""; + projectRoot = Cocoa; targets = ( 8D1107260486CEB800E47090 /* Atomicity */, ); @@ -232,12 +237,12 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */, - 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */, - 832BA38413FE674C00516BD7 /* APPL.icns in Resources */, - 8321C5F11404ADE60029952E /* AtomWindow.xib in Resources */, - 044A1F0314080A510006B340 /* class.js in Resources */, - 044A1F0514080A540006B340 /* jslint-jscocoa.js in Resources */, + 837D8BB41408FAC3009B6DFA /* APPL.icns in Resources */, + 837D8BB51408FAC3009B6DFA /* Atomicity-Info.plist in Resources */, + 837D8BB61408FAC3009B6DFA /* InfoPlist.strings in Resources */, + 837D8BB71408FAC3009B6DFA /* MainMenu.xib in Resources */, + 837D8BE11408FAF5009B6DFA /* AtomWindow.xib in Resources */, + 837D8BE91408FB15009B6DFA /* Rakefile in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -256,7 +261,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"$PROJECT_DIR/script/compile.sh\" "; + shellScript = "rake build"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -266,35 +271,39 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8359A72213FE270F00AC37E3 /* BridgeSupportController.m in Sources */, - 8359A72F13FE270F00AC37E3 /* JSCocoaController.m in Sources */, - 8359A73013FE270F00AC37E3 /* JSCocoaFFIArgument.m in Sources */, - 8359A73113FE270F00AC37E3 /* JSCocoaFFIClosure.m in Sources */, - 8359A73213FE270F00AC37E3 /* JSCocoaLib.m in Sources */, - 8359A73313FE270F00AC37E3 /* JSCocoaPrivateObject.m in Sources */, - 8321C5F61404ADF00029952E /* AtomicityAppDelegate.m in Sources */, - 8321C5F71404ADF00029952E /* AtomWindowController.m in Sources */, - 8321C5FB1404AE0C0029952E /* main.m in Sources */, + 837D8BA81408FAAA009B6DFA /* AtomicityAppDelegate.m in Sources */, + 837D8BA91408FAAA009B6DFA /* AtomWindowController.m in Sources */, + 837D8BAC1408FAB4009B6DFA /* main.m in Sources */, + 837D8BD51408FAD4009B6DFA /* BridgeSupportController.m in Sources */, + 837D8BD61408FAD4009B6DFA /* class.js in Sources */, + 837D8BD71408FAD4009B6DFA /* JSCocoaController.m in Sources */, + 837D8BD81408FAD4009B6DFA /* JSCocoaFFIArgument.m in Sources */, + 837D8BD91408FAD4009B6DFA /* JSCocoaFFIClosure.m in Sources */, + 837D8BDA1408FAD4009B6DFA /* JSCocoaLib.m in Sources */, + 837D8BDB1408FAD4009B6DFA /* JSCocoaPrivateObject.m in Sources */, + 837D8BDC1408FAD4009B6DFA /* jslint-jscocoa.js in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ - 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = { + 837D8BB01408FAC3009B6DFA /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( - 089C165DFE840E0CC02AAC07 /* English */, + 837D8BB11408FAC3009B6DFA /* English */, ); name = InfoPlist.strings; + path = ../../Atomicity/Cocoa/English.lproj; sourceTree = ""; }; - 1DDD58140DA1D0A300B32029 /* MainMenu.xib */ = { + 837D8BB21408FAC3009B6DFA /* MainMenu.xib */ = { isa = PBXVariantGroup; children = ( - 1DDD58150DA1D0A300B32029 /* English */, + 837D8BB31408FAC3009B6DFA /* English */, ); name = MainMenu.xib; + path = ../../Atomicity/Cocoa/English.lproj; sourceTree = ""; }; /* End PBXVariantGroup section */ @@ -347,13 +356,13 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = ""; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-lxml2", "-lffi", ); PREBINDING = NO; - SDKROOT = macosx10.6; }; name = Debug; }; @@ -364,12 +373,12 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = ""; OTHER_LDFLAGS = ( "-lxml2", "-lffi", ); PREBINDING = NO; - SDKROOT = macosx10.6; }; name = Release; }; diff --git a/Atomicity_Prefix.pch b/Cocoa/Atomicity_Prefix.pch similarity index 100% rename from Atomicity_Prefix.pch rename to Cocoa/Atomicity_Prefix.pch diff --git a/Classes/AtomWindowController.h b/Cocoa/Classes/AtomWindowController.h similarity index 100% rename from Classes/AtomWindowController.h rename to Cocoa/Classes/AtomWindowController.h diff --git a/Classes/AtomWindowController.m b/Cocoa/Classes/AtomWindowController.m similarity index 97% rename from Classes/AtomWindowController.m rename to Cocoa/Classes/AtomWindowController.m index c4c865fb8..ae6c4e469 100644 --- a/Classes/AtomWindowController.m +++ b/Cocoa/Classes/AtomWindowController.m @@ -32,13 +32,13 @@ } else { NSString *resourcePath = [[NSBundle mainBundle] resourcePath]; - NSString *bootstrapPath = [resourcePath stringByAppendingString:@"/HTML/lib/bootstrap.js"]; + NSString *bootstrapPath = [resourcePath stringByAppendingString:@"/src/bootstrap.js"]; JSCocoa* jsc = [[JSCocoa alloc] initWithGlobalContext:[[webView mainFrame] globalContext]]; [jsc setObject:self withName:@"WindowController"]; [jsc evalJSFile:bootstrapPath]; NSURL *resourceURL = [[NSBundle mainBundle] resourceURL]; - NSURL *htmlURL = [resourceURL URLByAppendingPathComponent:@"HTML"]; + NSURL *htmlURL = [resourceURL URLByAppendingPathComponent:@"static"]; NSURL *indexURL = [htmlURL URLByAppendingPathComponent:@"index.html"]; NSString *html = [NSString stringWithContentsOfURL:indexURL encoding:NSUTF8StringEncoding error:nil]; [[webView mainFrame] loadHTMLString:html baseURL:htmlURL]; diff --git a/Classes/AtomicityAppDelegate.h b/Cocoa/Classes/AtomicityAppDelegate.h similarity index 100% rename from Classes/AtomicityAppDelegate.h rename to Cocoa/Classes/AtomicityAppDelegate.h diff --git a/Classes/AtomicityAppDelegate.m b/Cocoa/Classes/AtomicityAppDelegate.m similarity index 100% rename from Classes/AtomicityAppDelegate.m rename to Cocoa/Classes/AtomicityAppDelegate.m diff --git a/English.lproj/InfoPlist.strings b/Cocoa/English.lproj/InfoPlist.strings similarity index 100% rename from English.lproj/InfoPlist.strings rename to Cocoa/English.lproj/InfoPlist.strings diff --git a/English.lproj/MainMenu.xib b/Cocoa/English.lproj/MainMenu.xib similarity index 100% rename from English.lproj/MainMenu.xib rename to Cocoa/English.lproj/MainMenu.xib diff --git a/JSCocoa/BridgeSupportController.h b/Cocoa/JSCocoa/BridgeSupportController.h similarity index 100% rename from JSCocoa/BridgeSupportController.h rename to Cocoa/JSCocoa/BridgeSupportController.h diff --git a/JSCocoa/BridgeSupportController.m b/Cocoa/JSCocoa/BridgeSupportController.m similarity index 100% rename from JSCocoa/BridgeSupportController.m rename to Cocoa/JSCocoa/BridgeSupportController.m diff --git a/JSCocoa/JSCocoa.h b/Cocoa/JSCocoa/JSCocoa.h similarity index 100% rename from JSCocoa/JSCocoa.h rename to Cocoa/JSCocoa/JSCocoa.h diff --git a/JSCocoa/JSCocoaController.h b/Cocoa/JSCocoa/JSCocoaController.h similarity index 100% rename from JSCocoa/JSCocoaController.h rename to Cocoa/JSCocoa/JSCocoaController.h diff --git a/JSCocoa/JSCocoaController.m b/Cocoa/JSCocoa/JSCocoaController.m similarity index 100% rename from JSCocoa/JSCocoaController.m rename to Cocoa/JSCocoa/JSCocoaController.m diff --git a/JSCocoa/JSCocoaFFIArgument.h b/Cocoa/JSCocoa/JSCocoaFFIArgument.h similarity index 100% rename from JSCocoa/JSCocoaFFIArgument.h rename to Cocoa/JSCocoa/JSCocoaFFIArgument.h diff --git a/JSCocoa/JSCocoaFFIArgument.m b/Cocoa/JSCocoa/JSCocoaFFIArgument.m similarity index 100% rename from JSCocoa/JSCocoaFFIArgument.m rename to Cocoa/JSCocoa/JSCocoaFFIArgument.m diff --git a/JSCocoa/JSCocoaFFIClosure.h b/Cocoa/JSCocoa/JSCocoaFFIClosure.h similarity index 100% rename from JSCocoa/JSCocoaFFIClosure.h rename to Cocoa/JSCocoa/JSCocoaFFIClosure.h diff --git a/JSCocoa/JSCocoaFFIClosure.m b/Cocoa/JSCocoa/JSCocoaFFIClosure.m similarity index 100% rename from JSCocoa/JSCocoaFFIClosure.m rename to Cocoa/JSCocoa/JSCocoaFFIClosure.m diff --git a/JSCocoa/JSCocoaLib.h b/Cocoa/JSCocoa/JSCocoaLib.h similarity index 100% rename from JSCocoa/JSCocoaLib.h rename to Cocoa/JSCocoa/JSCocoaLib.h diff --git a/JSCocoa/JSCocoaLib.m b/Cocoa/JSCocoa/JSCocoaLib.m similarity index 100% rename from JSCocoa/JSCocoaLib.m rename to Cocoa/JSCocoa/JSCocoaLib.m diff --git a/JSCocoa/JSCocoaPrivateObject.h b/Cocoa/JSCocoa/JSCocoaPrivateObject.h similarity index 100% rename from JSCocoa/JSCocoaPrivateObject.h rename to Cocoa/JSCocoa/JSCocoaPrivateObject.h diff --git a/JSCocoa/JSCocoaPrivateObject.m b/Cocoa/JSCocoa/JSCocoaPrivateObject.m similarity index 100% rename from JSCocoa/JSCocoaPrivateObject.m rename to Cocoa/JSCocoa/JSCocoaPrivateObject.m diff --git a/JSCocoa/class.js b/Cocoa/JSCocoa/class.js similarity index 100% rename from JSCocoa/class.js rename to Cocoa/JSCocoa/class.js diff --git a/JSCocoa/jslint-jscocoa.js b/Cocoa/JSCocoa/jslint-jscocoa.js similarity index 100% rename from JSCocoa/jslint-jscocoa.js rename to Cocoa/JSCocoa/jslint-jscocoa.js diff --git a/main.m b/Cocoa/main.m similarity index 100% rename from main.m rename to Cocoa/main.m diff --git a/xibs/AtomWindow.xib b/Cocoa/xibs/AtomWindow.xib similarity index 100% rename from xibs/AtomWindow.xib rename to Cocoa/xibs/AtomWindow.xib diff --git a/HTML/gh.png b/HTML/gh.png deleted file mode 100644 index 655644afc..000000000 Binary files a/HTML/gh.png and /dev/null differ diff --git a/HTML/lib/bootstrap.coffee b/HTML/lib/bootstrap.coffee deleted file mode 100644 index e86f3b76b..000000000 --- a/HTML/lib/bootstrap.coffee +++ /dev/null @@ -1,37 +0,0 @@ -# This file is the first thing loaded on startup. - -console.log = (thing) -> OSX.NSLog thing.toString() - -modules = {} -this.require = (path) -> - # hack for stupid requirejs - if path.indexOf('ace/requirejs/text!') > -1 - path = path.replace 'ace/requirejs/text!', '' - text = true - - return modules[path] if modules[path] - - root = OSX.NSBundle.mainBundle.resourcePath + '/HTML/' - filename = if text then "#{root}/#{path}" else "#{root}/#{path}.js" - file = OSX.NSString.stringWithContentsOfFile filename - - if text - modules[path] = file.toString() - return modules[path] - - exports = {} - module = exports: exports - - src = "function define(cb){cb.call(this,require,exports)};" - src += """(function(exports, define, module){ - #{file} - }).call(exports, exports, define, module); - """ - eval src - - modules[path] = module.exports or exports - modules[path] - -this.require.nameToUrl = (path) -> "#{path}.js" - -this._ = require 'vendor/underscore' diff --git a/HTML/project.html b/HTML/project.html deleted file mode 100644 index 408782794..000000000 --- a/HTML/project.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - -
-
    diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..c2678e5c3 --- /dev/null +++ b/Rakefile @@ -0,0 +1,25 @@ +ENV['PATH'] = "#{ENV['PATH']}:/usr/local/bin/" + +desc "Build the shit." +task :build do + project_dir = ENV['PROJECT_DIR'] || '.' + built_dir = ENV['BUILT_PRODUCTS_DIR'] || '.' + contents_dir = ENV['CONTENTS_FOLDER_PATH'].to_s + + dest = File.join(built_dir, contents_dir, "Resources") + + %w( src docs static vendor ).each do |dir| + rm_rf File.join(dest, dir) + cp_r dir, File.join(dest, dir) + end + + Dir['src/**/*.coffee'].each do |file| + sh "coffee -c #{dest}/src" + end +end + +desc "Install the app in /Applications" +task :install do + rm_rf "/Applications/Atomicity.app" + cp_r "Cocoa/build/Debug/Atomicity.app /Applications" +end diff --git a/api.coffee b/docs/api.coffee similarity index 100% rename from api.coffee rename to docs/api.coffee diff --git a/script/compile.sh b/script/compile.sh deleted file mode 100755 index 5bc38ed56..000000000 --- a/script/compile.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -SOURCE_SCRIPTS_DIR="$PROJECT_DIR/html" -DESTINATION_SCRIPTS_DIR="$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources/" - -PATH="$PATH:/usr/local/bin/" -hash coffee 2>&- || { echo >&2 "error: Coffee is required but it's not installed (http://jashkenas.github.com/coffee-script/)."; exit 1; } -coffee -o "$DESTINATION_SCRIPTS_DIR/HTML/lib/" HTML/lib/*.coffee - -cp -r "$SOURCE_SCRIPTS_DIR" "$DESTINATION_SCRIPTS_DIR" diff --git a/script/install.sh b/script/install.sh deleted file mode 100755 index 5b0ef8264..000000000 --- a/script/install.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -rm -rf /Applications/Atomicity.app -cp -r build/Debug/Atomicity.app /Applications diff --git a/HTML/lib/atomicity.coffee b/src/atomicity.coffee similarity index 96% rename from HTML/lib/atomicity.coffee rename to src/atomicity.coffee index ca046b795..3a2d72d09 100644 --- a/HTML/lib/atomicity.coffee +++ b/src/atomicity.coffee @@ -1,12 +1,12 @@ # nice! -{Chrome, File, Process, Dir} = require 'lib/osx' +{Chrome, File, Process, Dir} = require 'osx' ace = require 'ace/ace' canon = require 'pilot/canon' -$ = require 'vendor/jquery' -{CoffeeScript} = require 'vendor/coffee-script' +$ = require 'jquery' +{CoffeeScript} = require 'coffee-script' Chrome.addPane 'main', '
    ' diff --git a/src/bootstrap.coffee b/src/bootstrap.coffee new file mode 100644 index 000000000..d525c1ddb --- /dev/null +++ b/src/bootstrap.coffee @@ -0,0 +1,43 @@ +# This file is the first thing loaded on startup. + +console.log = (thing) -> OSX.NSLog thing.toString() + +modules = {} +paths = ['src', 'vendor'] +this.require = (file) -> + # hack for stupid requirejs + if file.indexOf('ace/requirejs/text!') > -1 + file = file.replace 'ace/requirejs/text!', '' + text = true + + return modules[file] if modules[file] + + code = null + paths.forEach (path) -> + return code if code + root = OSX.NSBundle.mainBundle.resourcePath + "/#{path}" + fullpath = if text then "#{root}/#{file}" else "#{root}/#{file}.js" + code = OSX.NSString.stringWithContentsOfFile fullpath + + if text + modules[file] = code.toString() + return modules[file] + + exports = {} + module = exports: exports + + src = "function define(cb){cb.call(this,require,exports)};" + src += """(function(exports, define, module){ + #{code} + }).call(exports, exports, define, module); + """ + eval src + + modules[file] = module.exports or exports + modules[file] + +this.require.paths = paths + +this.require.nameToUrl = (path) -> "#{path}.js" + +this._ = require 'underscore' diff --git a/HTML/lib/document.coffee b/src/document.coffee similarity index 100% rename from HTML/lib/document.coffee rename to src/document.coffee diff --git a/HTML/lib/osx.coffee b/src/osx.coffee similarity index 99% rename from HTML/lib/osx.coffee rename to src/osx.coffee index d59b27f4f..75276c9c5 100644 --- a/HTML/lib/osx.coffee +++ b/src/osx.coffee @@ -1,6 +1,6 @@ # This is the CoffeeScript API that wraps all of Cocoa. -$ = require 'vendor/jquery' +$ = require 'jquery' # Handles the UI chrome Chrome = diff --git a/HTML/lib/project.coffee b/src/project.coffee similarity index 92% rename from HTML/lib/project.coffee rename to src/project.coffee index 47a347cb7..30ba9cd5e 100644 --- a/HTML/lib/project.coffee +++ b/src/project.coffee @@ -1,3 +1,5 @@ +$ = require 'jquery' + $ -> dir = OSX.NSFileManager.defaultManager.currentDirectoryPath $('#cwd').text(dir) diff --git a/HTML/lib/tabs.coffee b/src/tabs.coffee similarity index 91% rename from HTML/lib/tabs.coffee rename to src/tabs.coffee index 72e782ebb..4f4e3667b 100644 --- a/HTML/lib/tabs.coffee +++ b/src/tabs.coffee @@ -1,6 +1,6 @@ -$ = require 'vendor/jquery' +$ = require 'jquery' -{Chrome, File, Dir, Process} = require 'lib/osx' +{Chrome, File, Dir, Process} = require 'osx' exports.show = -> root = OSX.NSBundle.mainBundle.resourcePath + '/HTML/' diff --git a/HTML/editor.html b/static/editor.html similarity index 87% rename from HTML/editor.html rename to static/editor.html index 80ed8b784..481152963 100644 --- a/HTML/editor.html +++ b/static/editor.html @@ -15,5 +15,5 @@
    diff --git a/html-frame-test.html b/static/html-frame-test.html similarity index 100% rename from html-frame-test.html rename to static/html-frame-test.html diff --git a/images/belt-small.png b/static/images/belt-small.png similarity index 100% rename from images/belt-small.png rename to static/images/belt-small.png diff --git a/images/belt.png b/static/images/belt.png similarity index 100% rename from images/belt.png rename to static/images/belt.png diff --git a/HTML/index.html b/static/index.html similarity index 97% rename from HTML/index.html rename to static/index.html index 18a143623..acfb944cb 100644 --- a/HTML/index.html +++ b/static/index.html @@ -71,7 +71,7 @@ diff --git a/static/project.html b/static/project.html new file mode 100644 index 000000000..680c5ccac --- /dev/null +++ b/static/project.html @@ -0,0 +1,22 @@ + + +
    +
      + + \ No newline at end of file diff --git a/HTML/tabs.html b/static/tabs.html similarity index 100% rename from HTML/tabs.html rename to static/tabs.html diff --git a/HTML/ace/ace.js b/vendor/ace/ace.js similarity index 100% rename from HTML/ace/ace.js rename to vendor/ace/ace.js diff --git a/HTML/ace/anchor.js b/vendor/ace/anchor.js similarity index 100% rename from HTML/ace/anchor.js rename to vendor/ace/anchor.js diff --git a/HTML/ace/anchor_test.js b/vendor/ace/anchor_test.js similarity index 100% rename from HTML/ace/anchor_test.js rename to vendor/ace/anchor_test.js diff --git a/HTML/ace/background_tokenizer.js b/vendor/ace/background_tokenizer.js similarity index 100% rename from HTML/ace/background_tokenizer.js rename to vendor/ace/background_tokenizer.js diff --git a/HTML/ace/commands/default_commands.js b/vendor/ace/commands/default_commands.js similarity index 100% rename from HTML/ace/commands/default_commands.js rename to vendor/ace/commands/default_commands.js diff --git a/HTML/ace/css/editor.css b/vendor/ace/css/editor.css similarity index 100% rename from HTML/ace/css/editor.css rename to vendor/ace/css/editor.css diff --git a/HTML/ace/defaults.js b/vendor/ace/defaults.js similarity index 100% rename from HTML/ace/defaults.js rename to vendor/ace/defaults.js diff --git a/HTML/ace/document.js b/vendor/ace/document.js similarity index 100% rename from HTML/ace/document.js rename to vendor/ace/document.js diff --git a/HTML/ace/document_test.js b/vendor/ace/document_test.js similarity index 100% rename from HTML/ace/document_test.js rename to vendor/ace/document_test.js diff --git a/HTML/ace/edit_session.js b/vendor/ace/edit_session.js similarity index 100% rename from HTML/ace/edit_session.js rename to vendor/ace/edit_session.js diff --git a/HTML/ace/edit_session/fold.js b/vendor/ace/edit_session/fold.js similarity index 100% rename from HTML/ace/edit_session/fold.js rename to vendor/ace/edit_session/fold.js diff --git a/HTML/ace/edit_session/fold_line.js b/vendor/ace/edit_session/fold_line.js similarity index 100% rename from HTML/ace/edit_session/fold_line.js rename to vendor/ace/edit_session/fold_line.js diff --git a/HTML/ace/edit_session/folding.js b/vendor/ace/edit_session/folding.js similarity index 100% rename from HTML/ace/edit_session/folding.js rename to vendor/ace/edit_session/folding.js diff --git a/HTML/ace/edit_session_test.js b/vendor/ace/edit_session_test.js similarity index 100% rename from HTML/ace/edit_session_test.js rename to vendor/ace/edit_session_test.js diff --git a/HTML/ace/editor.js b/vendor/ace/editor.js similarity index 100% rename from HTML/ace/editor.js rename to vendor/ace/editor.js diff --git a/HTML/ace/editor_change_document_test.js b/vendor/ace/editor_change_document_test.js similarity index 100% rename from HTML/ace/editor_change_document_test.js rename to vendor/ace/editor_change_document_test.js diff --git a/HTML/ace/editor_highlight_selected_word_test.js b/vendor/ace/editor_highlight_selected_word_test.js similarity index 100% rename from HTML/ace/editor_highlight_selected_word_test.js rename to vendor/ace/editor_highlight_selected_word_test.js diff --git a/HTML/ace/editor_navigation_test.js b/vendor/ace/editor_navigation_test.js similarity index 100% rename from HTML/ace/editor_navigation_test.js rename to vendor/ace/editor_navigation_test.js diff --git a/HTML/ace/editor_text_edit_test.js b/vendor/ace/editor_text_edit_test.js similarity index 100% rename from HTML/ace/editor_text_edit_test.js rename to vendor/ace/editor_text_edit_test.js diff --git a/HTML/ace/keyboard/hash_handler.js b/vendor/ace/keyboard/hash_handler.js similarity index 100% rename from HTML/ace/keyboard/hash_handler.js rename to vendor/ace/keyboard/hash_handler.js diff --git a/HTML/ace/keyboard/keybinding.js b/vendor/ace/keyboard/keybinding.js similarity index 100% rename from HTML/ace/keyboard/keybinding.js rename to vendor/ace/keyboard/keybinding.js diff --git a/HTML/ace/keyboard/keybinding/emacs.js b/vendor/ace/keyboard/keybinding/emacs.js similarity index 100% rename from HTML/ace/keyboard/keybinding/emacs.js rename to vendor/ace/keyboard/keybinding/emacs.js diff --git a/HTML/ace/keyboard/keybinding/vim.js b/vendor/ace/keyboard/keybinding/vim.js similarity index 100% rename from HTML/ace/keyboard/keybinding/vim.js rename to vendor/ace/keyboard/keybinding/vim.js diff --git a/HTML/ace/keyboard/state_handler.js b/vendor/ace/keyboard/state_handler.js similarity index 100% rename from HTML/ace/keyboard/state_handler.js rename to vendor/ace/keyboard/state_handler.js diff --git a/HTML/ace/keyboard/textinput.js b/vendor/ace/keyboard/textinput.js similarity index 100% rename from HTML/ace/keyboard/textinput.js rename to vendor/ace/keyboard/textinput.js diff --git a/HTML/ace/layer/cursor.js b/vendor/ace/layer/cursor.js similarity index 100% rename from HTML/ace/layer/cursor.js rename to vendor/ace/layer/cursor.js diff --git a/HTML/ace/layer/gutter.js b/vendor/ace/layer/gutter.js similarity index 100% rename from HTML/ace/layer/gutter.js rename to vendor/ace/layer/gutter.js diff --git a/HTML/ace/layer/marker.js b/vendor/ace/layer/marker.js similarity index 100% rename from HTML/ace/layer/marker.js rename to vendor/ace/layer/marker.js diff --git a/HTML/ace/layer/text.js b/vendor/ace/layer/text.js similarity index 100% rename from HTML/ace/layer/text.js rename to vendor/ace/layer/text.js diff --git a/HTML/ace/layer/text_test.js b/vendor/ace/layer/text_test.js similarity index 100% rename from HTML/ace/layer/text_test.js rename to vendor/ace/layer/text_test.js diff --git a/HTML/ace/lib/net.js b/vendor/ace/lib/net.js similarity index 100% rename from HTML/ace/lib/net.js rename to vendor/ace/lib/net.js diff --git a/HTML/ace/mode/behaviour.js b/vendor/ace/mode/behaviour.js similarity index 100% rename from HTML/ace/mode/behaviour.js rename to vendor/ace/mode/behaviour.js diff --git a/HTML/ace/mode/behaviour/cstyle.js b/vendor/ace/mode/behaviour/cstyle.js similarity index 100% rename from HTML/ace/mode/behaviour/cstyle.js rename to vendor/ace/mode/behaviour/cstyle.js diff --git a/HTML/ace/mode/behaviour/xml.js b/vendor/ace/mode/behaviour/xml.js similarity index 100% rename from HTML/ace/mode/behaviour/xml.js rename to vendor/ace/mode/behaviour/xml.js diff --git a/HTML/ace/mode/c_cpp.js b/vendor/ace/mode/c_cpp.js similarity index 100% rename from HTML/ace/mode/c_cpp.js rename to vendor/ace/mode/c_cpp.js diff --git a/HTML/ace/mode/c_cpp_highlight_rules.js b/vendor/ace/mode/c_cpp_highlight_rules.js similarity index 100% rename from HTML/ace/mode/c_cpp_highlight_rules.js rename to vendor/ace/mode/c_cpp_highlight_rules.js diff --git a/HTML/ace/mode/clojure.js b/vendor/ace/mode/clojure.js similarity index 100% rename from HTML/ace/mode/clojure.js rename to vendor/ace/mode/clojure.js diff --git a/HTML/ace/mode/clojure_highlight_rules.js b/vendor/ace/mode/clojure_highlight_rules.js similarity index 100% rename from HTML/ace/mode/clojure_highlight_rules.js rename to vendor/ace/mode/clojure_highlight_rules.js diff --git a/HTML/ace/mode/coffee.js b/vendor/ace/mode/coffee.js similarity index 100% rename from HTML/ace/mode/coffee.js rename to vendor/ace/mode/coffee.js diff --git a/HTML/ace/mode/coffee/coffee-script.js b/vendor/ace/mode/coffee/coffee-script.js similarity index 100% rename from HTML/ace/mode/coffee/coffee-script.js rename to vendor/ace/mode/coffee/coffee-script.js diff --git a/HTML/ace/mode/coffee/helpers.js b/vendor/ace/mode/coffee/helpers.js similarity index 100% rename from HTML/ace/mode/coffee/helpers.js rename to vendor/ace/mode/coffee/helpers.js diff --git a/HTML/ace/mode/coffee/lexer.js b/vendor/ace/mode/coffee/lexer.js similarity index 100% rename from HTML/ace/mode/coffee/lexer.js rename to vendor/ace/mode/coffee/lexer.js diff --git a/HTML/ace/mode/coffee/nodes.js b/vendor/ace/mode/coffee/nodes.js similarity index 100% rename from HTML/ace/mode/coffee/nodes.js rename to vendor/ace/mode/coffee/nodes.js diff --git a/HTML/ace/mode/coffee/parser.js b/vendor/ace/mode/coffee/parser.js similarity index 100% rename from HTML/ace/mode/coffee/parser.js rename to vendor/ace/mode/coffee/parser.js diff --git a/HTML/ace/mode/coffee/parser_test.js b/vendor/ace/mode/coffee/parser_test.js similarity index 100% rename from HTML/ace/mode/coffee/parser_test.js rename to vendor/ace/mode/coffee/parser_test.js diff --git a/HTML/ace/mode/coffee/rewriter.js b/vendor/ace/mode/coffee/rewriter.js similarity index 100% rename from HTML/ace/mode/coffee/rewriter.js rename to vendor/ace/mode/coffee/rewriter.js diff --git a/HTML/ace/mode/coffee/scope.js b/vendor/ace/mode/coffee/scope.js similarity index 100% rename from HTML/ace/mode/coffee/scope.js rename to vendor/ace/mode/coffee/scope.js diff --git a/HTML/ace/mode/coffee_highlight_rules.js b/vendor/ace/mode/coffee_highlight_rules.js similarity index 100% rename from HTML/ace/mode/coffee_highlight_rules.js rename to vendor/ace/mode/coffee_highlight_rules.js diff --git a/HTML/ace/mode/coffee_worker.js b/vendor/ace/mode/coffee_worker.js similarity index 100% rename from HTML/ace/mode/coffee_worker.js rename to vendor/ace/mode/coffee_worker.js diff --git a/HTML/ace/mode/csharp.js b/vendor/ace/mode/csharp.js similarity index 100% rename from HTML/ace/mode/csharp.js rename to vendor/ace/mode/csharp.js diff --git a/HTML/ace/mode/csharp_highlight_rules.js b/vendor/ace/mode/csharp_highlight_rules.js similarity index 100% rename from HTML/ace/mode/csharp_highlight_rules.js rename to vendor/ace/mode/csharp_highlight_rules.js diff --git a/HTML/ace/mode/css.js b/vendor/ace/mode/css.js similarity index 100% rename from HTML/ace/mode/css.js rename to vendor/ace/mode/css.js diff --git a/HTML/ace/mode/css/csslint.js b/vendor/ace/mode/css/csslint.js similarity index 100% rename from HTML/ace/mode/css/csslint.js rename to vendor/ace/mode/css/csslint.js diff --git a/HTML/ace/mode/css_highlight_rules.js b/vendor/ace/mode/css_highlight_rules.js similarity index 100% rename from HTML/ace/mode/css_highlight_rules.js rename to vendor/ace/mode/css_highlight_rules.js diff --git a/HTML/ace/mode/css_test.js b/vendor/ace/mode/css_test.js similarity index 100% rename from HTML/ace/mode/css_test.js rename to vendor/ace/mode/css_test.js diff --git a/HTML/ace/mode/css_tokenizer_test.js b/vendor/ace/mode/css_tokenizer_test.js similarity index 100% rename from HTML/ace/mode/css_tokenizer_test.js rename to vendor/ace/mode/css_tokenizer_test.js diff --git a/HTML/ace/mode/css_worker.js b/vendor/ace/mode/css_worker.js similarity index 100% rename from HTML/ace/mode/css_worker.js rename to vendor/ace/mode/css_worker.js diff --git a/HTML/ace/mode/css_worker_test.js b/vendor/ace/mode/css_worker_test.js similarity index 100% rename from HTML/ace/mode/css_worker_test.js rename to vendor/ace/mode/css_worker_test.js diff --git a/HTML/ace/mode/doc_comment_highlight_rules.js b/vendor/ace/mode/doc_comment_highlight_rules.js similarity index 100% rename from HTML/ace/mode/doc_comment_highlight_rules.js rename to vendor/ace/mode/doc_comment_highlight_rules.js diff --git a/HTML/ace/mode/groovy.js b/vendor/ace/mode/groovy.js similarity index 100% rename from HTML/ace/mode/groovy.js rename to vendor/ace/mode/groovy.js diff --git a/HTML/ace/mode/groovy_highlight_rules.js b/vendor/ace/mode/groovy_highlight_rules.js similarity index 100% rename from HTML/ace/mode/groovy_highlight_rules.js rename to vendor/ace/mode/groovy_highlight_rules.js diff --git a/HTML/ace/mode/html.js b/vendor/ace/mode/html.js similarity index 100% rename from HTML/ace/mode/html.js rename to vendor/ace/mode/html.js diff --git a/HTML/ace/mode/html_highlight_rules.js b/vendor/ace/mode/html_highlight_rules.js similarity index 100% rename from HTML/ace/mode/html_highlight_rules.js rename to vendor/ace/mode/html_highlight_rules.js diff --git a/HTML/ace/mode/html_test.js b/vendor/ace/mode/html_test.js similarity index 100% rename from HTML/ace/mode/html_test.js rename to vendor/ace/mode/html_test.js diff --git a/HTML/ace/mode/html_tokenizer_test.js b/vendor/ace/mode/html_tokenizer_test.js similarity index 100% rename from HTML/ace/mode/html_tokenizer_test.js rename to vendor/ace/mode/html_tokenizer_test.js diff --git a/HTML/ace/mode/java.js b/vendor/ace/mode/java.js similarity index 100% rename from HTML/ace/mode/java.js rename to vendor/ace/mode/java.js diff --git a/HTML/ace/mode/java_highlight_rules.js b/vendor/ace/mode/java_highlight_rules.js similarity index 100% rename from HTML/ace/mode/java_highlight_rules.js rename to vendor/ace/mode/java_highlight_rules.js diff --git a/HTML/ace/mode/javascript.js b/vendor/ace/mode/javascript.js similarity index 100% rename from HTML/ace/mode/javascript.js rename to vendor/ace/mode/javascript.js diff --git a/HTML/ace/mode/javascript_highlight_rules.js b/vendor/ace/mode/javascript_highlight_rules.js similarity index 100% rename from HTML/ace/mode/javascript_highlight_rules.js rename to vendor/ace/mode/javascript_highlight_rules.js diff --git a/HTML/ace/mode/javascript_test.js b/vendor/ace/mode/javascript_test.js similarity index 100% rename from HTML/ace/mode/javascript_test.js rename to vendor/ace/mode/javascript_test.js diff --git a/HTML/ace/mode/javascript_tokenizer_test.js b/vendor/ace/mode/javascript_tokenizer_test.js similarity index 100% rename from HTML/ace/mode/javascript_tokenizer_test.js rename to vendor/ace/mode/javascript_tokenizer_test.js diff --git a/HTML/ace/mode/javascript_worker.js b/vendor/ace/mode/javascript_worker.js similarity index 100% rename from HTML/ace/mode/javascript_worker.js rename to vendor/ace/mode/javascript_worker.js diff --git a/HTML/ace/mode/javascript_worker_test.js b/vendor/ace/mode/javascript_worker_test.js similarity index 100% rename from HTML/ace/mode/javascript_worker_test.js rename to vendor/ace/mode/javascript_worker_test.js diff --git a/HTML/ace/mode/json.js b/vendor/ace/mode/json.js similarity index 100% rename from HTML/ace/mode/json.js rename to vendor/ace/mode/json.js diff --git a/HTML/ace/mode/json_highlight_rules.js b/vendor/ace/mode/json_highlight_rules.js similarity index 100% rename from HTML/ace/mode/json_highlight_rules.js rename to vendor/ace/mode/json_highlight_rules.js diff --git a/HTML/ace/mode/lua.js b/vendor/ace/mode/lua.js similarity index 100% rename from HTML/ace/mode/lua.js rename to vendor/ace/mode/lua.js diff --git a/HTML/ace/mode/lua_highlight_rules.js b/vendor/ace/mode/lua_highlight_rules.js similarity index 100% rename from HTML/ace/mode/lua_highlight_rules.js rename to vendor/ace/mode/lua_highlight_rules.js diff --git a/HTML/ace/mode/markdown.js b/vendor/ace/mode/markdown.js similarity index 100% rename from HTML/ace/mode/markdown.js rename to vendor/ace/mode/markdown.js diff --git a/HTML/ace/mode/markdown_highlight_rules.js b/vendor/ace/mode/markdown_highlight_rules.js similarity index 100% rename from HTML/ace/mode/markdown_highlight_rules.js rename to vendor/ace/mode/markdown_highlight_rules.js diff --git a/HTML/ace/mode/matching_brace_outdent.js b/vendor/ace/mode/matching_brace_outdent.js similarity index 100% rename from HTML/ace/mode/matching_brace_outdent.js rename to vendor/ace/mode/matching_brace_outdent.js diff --git a/HTML/ace/mode/matching_parens_outdent.js b/vendor/ace/mode/matching_parens_outdent.js similarity index 100% rename from HTML/ace/mode/matching_parens_outdent.js rename to vendor/ace/mode/matching_parens_outdent.js diff --git a/HTML/ace/mode/ocaml.js b/vendor/ace/mode/ocaml.js similarity index 100% rename from HTML/ace/mode/ocaml.js rename to vendor/ace/mode/ocaml.js diff --git a/HTML/ace/mode/ocaml_highlight_rules.js b/vendor/ace/mode/ocaml_highlight_rules.js similarity index 100% rename from HTML/ace/mode/ocaml_highlight_rules.js rename to vendor/ace/mode/ocaml_highlight_rules.js diff --git a/HTML/ace/mode/perl.js b/vendor/ace/mode/perl.js similarity index 100% rename from HTML/ace/mode/perl.js rename to vendor/ace/mode/perl.js diff --git a/HTML/ace/mode/perl_highlight_rules.js b/vendor/ace/mode/perl_highlight_rules.js similarity index 100% rename from HTML/ace/mode/perl_highlight_rules.js rename to vendor/ace/mode/perl_highlight_rules.js diff --git a/HTML/ace/mode/php.js b/vendor/ace/mode/php.js similarity index 100% rename from HTML/ace/mode/php.js rename to vendor/ace/mode/php.js diff --git a/HTML/ace/mode/php_highlight_rules.js b/vendor/ace/mode/php_highlight_rules.js similarity index 100% rename from HTML/ace/mode/php_highlight_rules.js rename to vendor/ace/mode/php_highlight_rules.js diff --git a/HTML/ace/mode/python.js b/vendor/ace/mode/python.js similarity index 100% rename from HTML/ace/mode/python.js rename to vendor/ace/mode/python.js diff --git a/HTML/ace/mode/python_highlight_rules.js b/vendor/ace/mode/python_highlight_rules.js similarity index 100% rename from HTML/ace/mode/python_highlight_rules.js rename to vendor/ace/mode/python_highlight_rules.js diff --git a/HTML/ace/mode/python_test.js b/vendor/ace/mode/python_test.js similarity index 100% rename from HTML/ace/mode/python_test.js rename to vendor/ace/mode/python_test.js diff --git a/HTML/ace/mode/ruby.js b/vendor/ace/mode/ruby.js similarity index 100% rename from HTML/ace/mode/ruby.js rename to vendor/ace/mode/ruby.js diff --git a/HTML/ace/mode/ruby_highlight_rules.js b/vendor/ace/mode/ruby_highlight_rules.js similarity index 100% rename from HTML/ace/mode/ruby_highlight_rules.js rename to vendor/ace/mode/ruby_highlight_rules.js diff --git a/HTML/ace/mode/ruby_tokenizer_test.js b/vendor/ace/mode/ruby_tokenizer_test.js similarity index 100% rename from HTML/ace/mode/ruby_tokenizer_test.js rename to vendor/ace/mode/ruby_tokenizer_test.js diff --git a/HTML/ace/mode/scad.js b/vendor/ace/mode/scad.js similarity index 100% rename from HTML/ace/mode/scad.js rename to vendor/ace/mode/scad.js diff --git a/HTML/ace/mode/scad_highlight_rules.js b/vendor/ace/mode/scad_highlight_rules.js similarity index 100% rename from HTML/ace/mode/scad_highlight_rules.js rename to vendor/ace/mode/scad_highlight_rules.js diff --git a/HTML/ace/mode/scala.js b/vendor/ace/mode/scala.js similarity index 100% rename from HTML/ace/mode/scala.js rename to vendor/ace/mode/scala.js diff --git a/HTML/ace/mode/scala_highlight_rules.js b/vendor/ace/mode/scala_highlight_rules.js similarity index 100% rename from HTML/ace/mode/scala_highlight_rules.js rename to vendor/ace/mode/scala_highlight_rules.js diff --git a/HTML/ace/mode/scss.js b/vendor/ace/mode/scss.js similarity index 100% rename from HTML/ace/mode/scss.js rename to vendor/ace/mode/scss.js diff --git a/HTML/ace/mode/scss_highlight_rules.js b/vendor/ace/mode/scss_highlight_rules.js similarity index 100% rename from HTML/ace/mode/scss_highlight_rules.js rename to vendor/ace/mode/scss_highlight_rules.js diff --git a/HTML/ace/mode/svg.js b/vendor/ace/mode/svg.js similarity index 100% rename from HTML/ace/mode/svg.js rename to vendor/ace/mode/svg.js diff --git a/HTML/ace/mode/svg_highlight_rules.js b/vendor/ace/mode/svg_highlight_rules.js similarity index 100% rename from HTML/ace/mode/svg_highlight_rules.js rename to vendor/ace/mode/svg_highlight_rules.js diff --git a/HTML/ace/mode/text.js b/vendor/ace/mode/text.js similarity index 100% rename from HTML/ace/mode/text.js rename to vendor/ace/mode/text.js diff --git a/HTML/ace/mode/text_highlight_rules.js b/vendor/ace/mode/text_highlight_rules.js similarity index 100% rename from HTML/ace/mode/text_highlight_rules.js rename to vendor/ace/mode/text_highlight_rules.js diff --git a/HTML/ace/mode/text_test.js b/vendor/ace/mode/text_test.js similarity index 100% rename from HTML/ace/mode/text_test.js rename to vendor/ace/mode/text_test.js diff --git a/HTML/ace/mode/textile.js b/vendor/ace/mode/textile.js similarity index 100% rename from HTML/ace/mode/textile.js rename to vendor/ace/mode/textile.js diff --git a/HTML/ace/mode/textile_highlight_rules.js b/vendor/ace/mode/textile_highlight_rules.js similarity index 100% rename from HTML/ace/mode/textile_highlight_rules.js rename to vendor/ace/mode/textile_highlight_rules.js diff --git a/HTML/ace/mode/xml.js b/vendor/ace/mode/xml.js similarity index 100% rename from HTML/ace/mode/xml.js rename to vendor/ace/mode/xml.js diff --git a/HTML/ace/mode/xml_highlight_rules.js b/vendor/ace/mode/xml_highlight_rules.js similarity index 100% rename from HTML/ace/mode/xml_highlight_rules.js rename to vendor/ace/mode/xml_highlight_rules.js diff --git a/HTML/ace/mode/xml_test.js b/vendor/ace/mode/xml_test.js similarity index 100% rename from HTML/ace/mode/xml_test.js rename to vendor/ace/mode/xml_test.js diff --git a/HTML/ace/mode/xml_tokenizer_test.js b/vendor/ace/mode/xml_tokenizer_test.js similarity index 100% rename from HTML/ace/mode/xml_tokenizer_test.js rename to vendor/ace/mode/xml_tokenizer_test.js diff --git a/HTML/ace/mouse_handler.js b/vendor/ace/mouse_handler.js similarity index 100% rename from HTML/ace/mouse_handler.js rename to vendor/ace/mouse_handler.js diff --git a/HTML/ace/narcissus/jsdefs.js b/vendor/ace/narcissus/jsdefs.js similarity index 100% rename from HTML/ace/narcissus/jsdefs.js rename to vendor/ace/narcissus/jsdefs.js diff --git a/HTML/ace/narcissus/jslex.js b/vendor/ace/narcissus/jslex.js similarity index 100% rename from HTML/ace/narcissus/jslex.js rename to vendor/ace/narcissus/jslex.js diff --git a/HTML/ace/narcissus/jsparse.js b/vendor/ace/narcissus/jsparse.js similarity index 100% rename from HTML/ace/narcissus/jsparse.js rename to vendor/ace/narcissus/jsparse.js diff --git a/HTML/ace/range.js b/vendor/ace/range.js similarity index 100% rename from HTML/ace/range.js rename to vendor/ace/range.js diff --git a/HTML/ace/range_test.js b/vendor/ace/range_test.js similarity index 100% rename from HTML/ace/range_test.js rename to vendor/ace/range_test.js diff --git a/HTML/ace/renderloop.js b/vendor/ace/renderloop.js similarity index 100% rename from HTML/ace/renderloop.js rename to vendor/ace/renderloop.js diff --git a/HTML/ace/requirejs/text.js b/vendor/ace/requirejs/text.js similarity index 100% rename from HTML/ace/requirejs/text.js rename to vendor/ace/requirejs/text.js diff --git a/HTML/ace/scrollbar.js b/vendor/ace/scrollbar.js similarity index 100% rename from HTML/ace/scrollbar.js rename to vendor/ace/scrollbar.js diff --git a/HTML/ace/search.js b/vendor/ace/search.js similarity index 100% rename from HTML/ace/search.js rename to vendor/ace/search.js diff --git a/HTML/ace/search_test.js b/vendor/ace/search_test.js similarity index 100% rename from HTML/ace/search_test.js rename to vendor/ace/search_test.js diff --git a/HTML/ace/selection.js b/vendor/ace/selection.js similarity index 100% rename from HTML/ace/selection.js rename to vendor/ace/selection.js diff --git a/HTML/ace/selection_test.js b/vendor/ace/selection_test.js similarity index 100% rename from HTML/ace/selection_test.js rename to vendor/ace/selection_test.js diff --git a/HTML/ace/settings/default-settings.js b/vendor/ace/settings/default-settings.js similarity index 100% rename from HTML/ace/settings/default-settings.js rename to vendor/ace/settings/default-settings.js diff --git a/HTML/ace/split.js b/vendor/ace/split.js similarity index 100% rename from HTML/ace/split.js rename to vendor/ace/split.js diff --git a/HTML/ace/test/all.js b/vendor/ace/test/all.js similarity index 100% rename from HTML/ace/test/all.js rename to vendor/ace/test/all.js diff --git a/HTML/ace/test/all_browser.js b/vendor/ace/test/all_browser.js similarity index 100% rename from HTML/ace/test/all_browser.js rename to vendor/ace/test/all_browser.js diff --git a/HTML/ace/test/assertions.js b/vendor/ace/test/assertions.js similarity index 100% rename from HTML/ace/test/assertions.js rename to vendor/ace/test/assertions.js diff --git a/HTML/ace/test/asyncjs/assert.js b/vendor/ace/test/asyncjs/assert.js similarity index 100% rename from HTML/ace/test/asyncjs/assert.js rename to vendor/ace/test/asyncjs/assert.js diff --git a/HTML/ace/test/asyncjs/async.js b/vendor/ace/test/asyncjs/async.js similarity index 100% rename from HTML/ace/test/asyncjs/async.js rename to vendor/ace/test/asyncjs/async.js diff --git a/HTML/ace/test/asyncjs/index.js b/vendor/ace/test/asyncjs/index.js similarity index 100% rename from HTML/ace/test/asyncjs/index.js rename to vendor/ace/test/asyncjs/index.js diff --git a/HTML/ace/test/asyncjs/test.js b/vendor/ace/test/asyncjs/test.js similarity index 100% rename from HTML/ace/test/asyncjs/test.js rename to vendor/ace/test/asyncjs/test.js diff --git a/HTML/ace/test/asyncjs/utils.js b/vendor/ace/test/asyncjs/utils.js similarity index 100% rename from HTML/ace/test/asyncjs/utils.js rename to vendor/ace/test/asyncjs/utils.js diff --git a/HTML/ace/test/benchmark.js b/vendor/ace/test/benchmark.js similarity index 100% rename from HTML/ace/test/benchmark.js rename to vendor/ace/test/benchmark.js diff --git a/HTML/ace/test/event_emitter_test.js b/vendor/ace/test/event_emitter_test.js similarity index 100% rename from HTML/ace/test/event_emitter_test.js rename to vendor/ace/test/event_emitter_test.js diff --git a/HTML/ace/test/mockdom.js b/vendor/ace/test/mockdom.js similarity index 100% rename from HTML/ace/test/mockdom.js rename to vendor/ace/test/mockdom.js diff --git a/HTML/ace/test/mockrenderer.js b/vendor/ace/test/mockrenderer.js similarity index 100% rename from HTML/ace/test/mockrenderer.js rename to vendor/ace/test/mockrenderer.js diff --git a/HTML/ace/test/tests.html b/vendor/ace/test/tests.html similarity index 100% rename from HTML/ace/test/tests.html rename to vendor/ace/test/tests.html diff --git a/HTML/ace/theme/clouds.js b/vendor/ace/theme/clouds.js similarity index 100% rename from HTML/ace/theme/clouds.js rename to vendor/ace/theme/clouds.js diff --git a/HTML/ace/theme/clouds_midnight.js b/vendor/ace/theme/clouds_midnight.js similarity index 100% rename from HTML/ace/theme/clouds_midnight.js rename to vendor/ace/theme/clouds_midnight.js diff --git a/HTML/ace/theme/cobalt.js b/vendor/ace/theme/cobalt.js similarity index 100% rename from HTML/ace/theme/cobalt.js rename to vendor/ace/theme/cobalt.js diff --git a/HTML/ace/theme/crimson_editor.js b/vendor/ace/theme/crimson_editor.js similarity index 100% rename from HTML/ace/theme/crimson_editor.js rename to vendor/ace/theme/crimson_editor.js diff --git a/HTML/ace/theme/dawn.js b/vendor/ace/theme/dawn.js similarity index 100% rename from HTML/ace/theme/dawn.js rename to vendor/ace/theme/dawn.js diff --git a/HTML/ace/theme/eclipse.js b/vendor/ace/theme/eclipse.js similarity index 100% rename from HTML/ace/theme/eclipse.js rename to vendor/ace/theme/eclipse.js diff --git a/HTML/ace/theme/idle_fingers.js b/vendor/ace/theme/idle_fingers.js similarity index 100% rename from HTML/ace/theme/idle_fingers.js rename to vendor/ace/theme/idle_fingers.js diff --git a/HTML/ace/theme/kr_theme.js b/vendor/ace/theme/kr_theme.js similarity index 100% rename from HTML/ace/theme/kr_theme.js rename to vendor/ace/theme/kr_theme.js diff --git a/HTML/ace/theme/merbivore.js b/vendor/ace/theme/merbivore.js similarity index 100% rename from HTML/ace/theme/merbivore.js rename to vendor/ace/theme/merbivore.js diff --git a/HTML/ace/theme/merbivore_soft.js b/vendor/ace/theme/merbivore_soft.js similarity index 100% rename from HTML/ace/theme/merbivore_soft.js rename to vendor/ace/theme/merbivore_soft.js diff --git a/HTML/ace/theme/mono_industrial.js b/vendor/ace/theme/mono_industrial.js similarity index 100% rename from HTML/ace/theme/mono_industrial.js rename to vendor/ace/theme/mono_industrial.js diff --git a/HTML/ace/theme/monokai.js b/vendor/ace/theme/monokai.js similarity index 100% rename from HTML/ace/theme/monokai.js rename to vendor/ace/theme/monokai.js diff --git a/HTML/ace/theme/pastel_on_dark.js b/vendor/ace/theme/pastel_on_dark.js similarity index 100% rename from HTML/ace/theme/pastel_on_dark.js rename to vendor/ace/theme/pastel_on_dark.js diff --git a/HTML/ace/theme/solarized_dark.js b/vendor/ace/theme/solarized_dark.js similarity index 100% rename from HTML/ace/theme/solarized_dark.js rename to vendor/ace/theme/solarized_dark.js diff --git a/HTML/ace/theme/solarized_light.js b/vendor/ace/theme/solarized_light.js similarity index 100% rename from HTML/ace/theme/solarized_light.js rename to vendor/ace/theme/solarized_light.js diff --git a/HTML/ace/theme/textmate.js b/vendor/ace/theme/textmate.js similarity index 100% rename from HTML/ace/theme/textmate.js rename to vendor/ace/theme/textmate.js diff --git a/HTML/ace/theme/twilight.js b/vendor/ace/theme/twilight.js similarity index 100% rename from HTML/ace/theme/twilight.js rename to vendor/ace/theme/twilight.js diff --git a/HTML/ace/theme/vibrant_ink.js b/vendor/ace/theme/vibrant_ink.js similarity index 100% rename from HTML/ace/theme/vibrant_ink.js rename to vendor/ace/theme/vibrant_ink.js diff --git a/HTML/ace/tokenizer.js b/vendor/ace/tokenizer.js similarity index 100% rename from HTML/ace/tokenizer.js rename to vendor/ace/tokenizer.js diff --git a/HTML/ace/undomanager.js b/vendor/ace/undomanager.js similarity index 100% rename from HTML/ace/undomanager.js rename to vendor/ace/undomanager.js diff --git a/HTML/ace/unicode.js b/vendor/ace/unicode.js similarity index 100% rename from HTML/ace/unicode.js rename to vendor/ace/unicode.js diff --git a/HTML/ace/virtual_renderer.js b/vendor/ace/virtual_renderer.js similarity index 100% rename from HTML/ace/virtual_renderer.js rename to vendor/ace/virtual_renderer.js diff --git a/HTML/ace/virtual_renderer_test.js b/vendor/ace/virtual_renderer_test.js similarity index 100% rename from HTML/ace/virtual_renderer_test.js rename to vendor/ace/virtual_renderer_test.js diff --git a/HTML/ace/worker/jshint.js b/vendor/ace/worker/jshint.js similarity index 100% rename from HTML/ace/worker/jshint.js rename to vendor/ace/worker/jshint.js diff --git a/HTML/ace/worker/jslint.js b/vendor/ace/worker/jslint.js similarity index 100% rename from HTML/ace/worker/jslint.js rename to vendor/ace/worker/jslint.js diff --git a/HTML/ace/worker/mirror.js b/vendor/ace/worker/mirror.js similarity index 100% rename from HTML/ace/worker/mirror.js rename to vendor/ace/worker/mirror.js diff --git a/HTML/ace/worker/worker.js b/vendor/ace/worker/worker.js similarity index 100% rename from HTML/ace/worker/worker.js rename to vendor/ace/worker/worker.js diff --git a/HTML/ace/worker/worker_client.js b/vendor/ace/worker/worker_client.js similarity index 100% rename from HTML/ace/worker/worker_client.js rename to vendor/ace/worker/worker_client.js diff --git a/HTML/vendor/coffee-script.js b/vendor/coffee-script.js similarity index 100% rename from HTML/vendor/coffee-script.js rename to vendor/coffee-script.js diff --git a/HTML/vendor/jquery.js b/vendor/jquery.js similarity index 100% rename from HTML/vendor/jquery.js rename to vendor/jquery.js diff --git a/HTML/pilot/browser_focus.js b/vendor/pilot/browser_focus.js similarity index 100% rename from HTML/pilot/browser_focus.js rename to vendor/pilot/browser_focus.js diff --git a/HTML/pilot/canon.js b/vendor/pilot/canon.js similarity index 100% rename from HTML/pilot/canon.js rename to vendor/pilot/canon.js diff --git a/HTML/pilot/catalog.js b/vendor/pilot/catalog.js similarity index 100% rename from HTML/pilot/catalog.js rename to vendor/pilot/catalog.js diff --git a/HTML/pilot/commands/basic.js b/vendor/pilot/commands/basic.js similarity index 100% rename from HTML/pilot/commands/basic.js rename to vendor/pilot/commands/basic.js diff --git a/HTML/pilot/commands/history.js b/vendor/pilot/commands/history.js similarity index 100% rename from HTML/pilot/commands/history.js rename to vendor/pilot/commands/history.js diff --git a/HTML/pilot/commands/settings.js b/vendor/pilot/commands/settings.js similarity index 100% rename from HTML/pilot/commands/settings.js rename to vendor/pilot/commands/settings.js diff --git a/HTML/pilot/console.js b/vendor/pilot/console.js similarity index 100% rename from HTML/pilot/console.js rename to vendor/pilot/console.js diff --git a/HTML/pilot/dom.js b/vendor/pilot/dom.js similarity index 100% rename from HTML/pilot/dom.js rename to vendor/pilot/dom.js diff --git a/HTML/pilot/domtemplate.js b/vendor/pilot/domtemplate.js similarity index 100% rename from HTML/pilot/domtemplate.js rename to vendor/pilot/domtemplate.js diff --git a/HTML/pilot/environment.js b/vendor/pilot/environment.js similarity index 100% rename from HTML/pilot/environment.js rename to vendor/pilot/environment.js diff --git a/HTML/pilot/es5-shim.js b/vendor/pilot/es5-shim.js similarity index 100% rename from HTML/pilot/es5-shim.js rename to vendor/pilot/es5-shim.js diff --git a/HTML/pilot/event.js b/vendor/pilot/event.js similarity index 100% rename from HTML/pilot/event.js rename to vendor/pilot/event.js diff --git a/HTML/pilot/event_emitter.js b/vendor/pilot/event_emitter.js similarity index 100% rename from HTML/pilot/event_emitter.js rename to vendor/pilot/event_emitter.js diff --git a/HTML/pilot/fixoldbrowsers.js b/vendor/pilot/fixoldbrowsers.js similarity index 100% rename from HTML/pilot/fixoldbrowsers.js rename to vendor/pilot/fixoldbrowsers.js diff --git a/HTML/pilot/index.js b/vendor/pilot/index.js similarity index 100% rename from HTML/pilot/index.js rename to vendor/pilot/index.js diff --git a/HTML/pilot/keys.js b/vendor/pilot/keys.js similarity index 100% rename from HTML/pilot/keys.js rename to vendor/pilot/keys.js diff --git a/HTML/pilot/lang.js b/vendor/pilot/lang.js similarity index 100% rename from HTML/pilot/lang.js rename to vendor/pilot/lang.js diff --git a/HTML/pilot/oop.js b/vendor/pilot/oop.js similarity index 100% rename from HTML/pilot/oop.js rename to vendor/pilot/oop.js diff --git a/HTML/pilot/plugin_manager.js b/vendor/pilot/plugin_manager.js similarity index 100% rename from HTML/pilot/plugin_manager.js rename to vendor/pilot/plugin_manager.js diff --git a/HTML/pilot/promise.js b/vendor/pilot/promise.js similarity index 100% rename from HTML/pilot/promise.js rename to vendor/pilot/promise.js diff --git a/HTML/pilot/proxy.js b/vendor/pilot/proxy.js similarity index 100% rename from HTML/pilot/proxy.js rename to vendor/pilot/proxy.js diff --git a/HTML/pilot/rangeutils.js b/vendor/pilot/rangeutils.js similarity index 100% rename from HTML/pilot/rangeutils.js rename to vendor/pilot/rangeutils.js diff --git a/HTML/pilot/regexp.js b/vendor/pilot/regexp.js similarity index 100% rename from HTML/pilot/regexp.js rename to vendor/pilot/regexp.js diff --git a/HTML/pilot/settings.js b/vendor/pilot/settings.js similarity index 100% rename from HTML/pilot/settings.js rename to vendor/pilot/settings.js diff --git a/HTML/pilot/settings/canon.js b/vendor/pilot/settings/canon.js similarity index 100% rename from HTML/pilot/settings/canon.js rename to vendor/pilot/settings/canon.js diff --git a/HTML/pilot/stacktrace.js b/vendor/pilot/stacktrace.js similarity index 100% rename from HTML/pilot/stacktrace.js rename to vendor/pilot/stacktrace.js diff --git a/HTML/pilot/tests/testRangeutils.js b/vendor/pilot/tests/testRangeutils.js similarity index 100% rename from HTML/pilot/tests/testRangeutils.js rename to vendor/pilot/tests/testRangeutils.js diff --git a/HTML/pilot/typecheck.js b/vendor/pilot/typecheck.js similarity index 100% rename from HTML/pilot/typecheck.js rename to vendor/pilot/typecheck.js diff --git a/HTML/pilot/types.js b/vendor/pilot/types.js similarity index 100% rename from HTML/pilot/types.js rename to vendor/pilot/types.js diff --git a/HTML/pilot/types/basic.js b/vendor/pilot/types/basic.js similarity index 100% rename from HTML/pilot/types/basic.js rename to vendor/pilot/types/basic.js diff --git a/HTML/pilot/types/command.js b/vendor/pilot/types/command.js similarity index 100% rename from HTML/pilot/types/command.js rename to vendor/pilot/types/command.js diff --git a/HTML/pilot/types/settings.js b/vendor/pilot/types/settings.js similarity index 100% rename from HTML/pilot/types/settings.js rename to vendor/pilot/types/settings.js diff --git a/HTML/pilot/useragent.js b/vendor/pilot/useragent.js similarity index 100% rename from HTML/pilot/useragent.js rename to vendor/pilot/useragent.js diff --git a/HTML/vendor/underscore.js b/vendor/underscore.js similarity index 100% rename from HTML/vendor/underscore.js rename to vendor/underscore.js