Pchen0/electron

Browse Source

Atom Shell -> Electron

Kevin Sawicki 10 years ago

parent

6ca4623ae1

commit

6615ef1054

11 changed files with 18 additions and 18 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
README.md
							 
								View File
							
				@@ -1,6 +1,6 @@
			
				 # Electron [![Build Status](https://travis-ci.org/atom/atom-shell.svg?branch=master)](https://travis-ci.org/atom/atom-shell)
			
				-The Atom Shell framework lets you write cross-platform desktop applications
			
				+The Electron framework lets you write cross-platform desktop applications
			
				 using JavaScript, HTML and CSS. It is based on [io.js](http://iojs.org) and
			
				 [Chromium](http://www.chromium.org) and is used in the [Atom
			
				 editor](https://github.com/atom/atom).

						
							+ 3
							
							- 3
						
atom/browser/default_app/default_app.js
							 
								View File
							
				@@ -25,10 +25,10 @@ app.on('ready', function() {
			
				   if (process.platform == 'darwin') {
			
				     var template = [
			
				       {
			
				-        label: 'Atom Shell',
			
				+        label: 'Electron',
			
				         submenu: [
			
				           {
			
				-            label: 'About Atom Shell',
			
				+            label: 'About Electron',
			
				             selector: 'orderFrontStandardAboutPanel:'
			
				           },
			
				           {
			
				@@ -42,7 +42,7 @@ app.on('ready', function() {
			
				             type: 'separator'
			
				           },
			
				           {
			
				-            label: 'Hide Atom Shell',
			
				+            label: 'Hide Electron',
			
				             accelerator: 'Command+H',
			
				             selector: 'hide:'
			
				           },

						
							+ 2
							
							- 2
						
atom/browser/default_app/index.html
							 
								View File
							
				@@ -1,6 +1,6 @@
			
				 <html>
			
				 <head>
			
				-  <title>Atom Shell</title>
			
				+  <title>Electron</title>
			
				   <style>
			
				     body {
			
				       color: #555;
			
				@@ -72,7 +72,7 @@
			
				     };
			
				   </script>
			
				-  <h2 style="-webkit-app-region: drag">Welcome to Atom Shell</h2>
			
				+  <h2 style="-webkit-app-region: drag">Welcome to Electron</h2>
			
				   <p>
			
				   To run your app with atom-shell, execute the following command under your

						
							+ 1
							
							- 1
						
atom/browser/default_app/package.json
							 
								View File
							
				@@ -1,6 +1,6 @@
			
				 {
			
				   "name": "atom-shell-default-app",
			
				-  "productName": "Atom Shell Default App",
			
				+  "productName": "Electron Default App",
			
				   "version": "0.1.0",
			
				   "main": "main.js"
			
				 }

						
							+ 1
							
							- 1
						
atom/browser/native_window.cc
							 
								View File
							
				@@ -229,7 +229,7 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
			
				   if (options.Get(switches::kKiosk, &kiosk) && kiosk) {
			
				     SetKiosk(kiosk);
			
				   }
			
				-  std::string title("Atom Shell");
			
				+  std::string title("Electron");
			
				   options.Get(switches::kTitle, &title);
			
				   SetTitle(title);

						
							+ 1
							
							- 1
						
atom/common/node_bindings.cc
							 
								View File
							
				@@ -27,7 +27,7 @@ using content::BrowserThread;
			
				 #define REFERENCE_MODULE(name) \
			
				   extern "C" void _register_ ## name(void); \
			
				   void (*fp_register_ ## name)(void) = _register_ ## name
			
				-// Atom Shell's builtin modules.
			
				+// Electron's builtin modules.
			
				 REFERENCE_MODULE(atom_browser_app);
			
				 REFERENCE_MODULE(atom_browser_auto_updater);
			
				 REFERENCE_MODULE(atom_browser_content_tracing);

						
							+ 3
							
							- 3
						
docs/api/menu.md
							 
								View File
							
				@@ -33,10 +33,10 @@ Another example of creating the application menu with the simple template API:
			
				 // main.js
			
				 var template = [
			
				   {
			
				-    label: 'Atom Shell',
			
				+    label: 'Electron',
			
				     submenu: [
			
				       {
			
				-        label: 'About Atom Shell',
			
				+        label: 'About Electron',
			
				         selector: 'orderFrontStandardAboutPanel:'
			
				       },
			
				       {
			
				@@ -50,7 +50,7 @@ var template = [
			
				         type: 'separator'
			
				       },
			
				       {
			
				-        label: 'Hide Atom Shell',
			
				+        label: 'Hide Electron',
			
				         accelerator: 'Command+H',
			
				         selector: 'hide:'
			
				       },

						
							+ 1
							
							- 1
						
docs/development/build-instructions-windows.md
							 
								View File
							
				@@ -11,7 +11,7 @@
			
				 If you don't have a Windows installation at the moment,
			
				 [modern.ie](https://www.modern.ie/en-us/virtualization-tools#downloads) has
			
				-timebombed versions of Windows that you can use to build Atom Shell.
			
				+timebombed versions of Windows that you can use to build Electron.
			
				 The building of atom-shell is done entirely with command-line scripts, so you
			
				 can use any editor you like to develop atom-shell, but it also means you can

						
							+ 1
							
							- 1
						
docs/tutorial/debugging-main-process.md
							 
								View File
							
				@@ -18,7 +18,7 @@ Like `--debug` but pauses the script on the first line.
			
				 ## Use node-inspector for debugging
			
				-__Note:__ Atom Shell uses node v0.11.13, which currently doesn't work very well
			
				+__Note:__ Electron uses node v0.11.13, which currently doesn't work very well
			
				 with node-inspector, and the main process would crash if you inspect the
			
				 `process` object under node-inspector's console.

						
							+ 3
							
							- 3
						
spec/api-app-spec.coffee
							 
								View File
							
				@@ -15,11 +15,11 @@ describe 'app module', ->
			
				   describe 'app.getName()', ->
			
				     it 'returns the name field of package.json', ->
			
				-      assert.equal app.getName(), 'Atom Shell Test App'
			
				+      assert.equal app.getName(), 'Electron Test App'
			
				   describe 'app.setName(name)', ->
			
				     it 'overrides the name', ->
			
				-      assert.equal app.getName(), 'Atom Shell Test App'
			
				+      assert.equal app.getName(), 'Electron Test App'
			
				       app.setName 'test-name'
			
				       assert.equal app.getName(), 'test-name'
			
				-      app.setName 'Atom Shell Test App'
			
				+      app.setName 'Electron Test App'

						
							+ 1
							
							- 1
						
spec/package.json
							 
								View File
							
				@@ -1,6 +1,6 @@
			
				 {
			
				   "name": "atom-shell-specs",
			
				-  "productName": "Atom Shell Test App",
			
				+  "productName": "Electron Test App",
			
				   "main": "static/main.js",
			
				   "version": "0.1.0",
			
				   "devDependencies": {

Atom Shell -> Electron

+ 1 - 1 README.md View File

+ 3 - 3 atom/browser/default_app/default_app.js View File

+ 2 - 2 atom/browser/default_app/index.html View File

+ 1 - 1 atom/browser/default_app/package.json View File

+ 1 - 1 atom/browser/native_window.cc View File

+ 1 - 1 atom/common/node_bindings.cc View File

+ 3 - 3 docs/api/menu.md View File

+ 1 - 1 docs/development/build-instructions-windows.md View File

+ 1 - 1 docs/tutorial/debugging-main-process.md View File

+ 3 - 3 spec/api-app-spec.coffee View File

+ 1 - 1 spec/package.json View File

+ 1 - 1
README.md
View File

+ 3 - 3
atom/browser/default_app/default_app.js
View File

+ 2 - 2
atom/browser/default_app/index.html
View File

+ 1 - 1
atom/browser/default_app/package.json
View File

+ 1 - 1
atom/browser/native_window.cc
View File

+ 1 - 1
atom/common/node_bindings.cc
View File

+ 3 - 3
docs/api/menu.md
View File

+ 1 - 1
docs/development/build-instructions-windows.md
View File

+ 1 - 1
docs/tutorial/debugging-main-process.md
View File

+ 3 - 3
spec/api-app-spec.coffee
View File

+ 1 - 1
spec/package.json
View File