From 31354022b99e659e76e4fba22a94aeb8c6bb0f65 Mon Sep 17 00:00:00 2001 From: Jason Liu Date: Tue, 17 Jun 2014 12:06:39 -0700 Subject: [PATCH 1/4] Switch svg to woff font for firefox compatibility with fontello --- css/style.css | 3 ++- fonts/fontello.svg | 12 ------------ fonts/fontello.woff | Bin 0 -> 2624 bytes 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 fonts/fontello.svg create mode 100644 fonts/fontello.woff diff --git a/css/style.css b/css/style.css index 564398013..a6c66a2f6 100644 --- a/css/style.css +++ b/css/style.css @@ -18,7 +18,8 @@ } @font-face { font-family: 'fontello'; - src: url('../fonts/fontello.svg?32953337#fontello') format('svg'); + src: url('data:application/octet-stream;base64,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') format('woff'), + url('data:application/octet-stream;base64,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BkUrIyA8IC4jOLEmARQrLbA8LLEIBCVCsAAWsAQlsAQlIC5HI0cjYSCwBCNCsAZFKyCwYFBYILBAUVizAiADIBuzAiYDGllCQiMgR7AEQ7CAYmAgsAArIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbCAYmGwAiVGYTgjIDwjOBshICBGI0ewACsjYTghWbEmARQrLbA9LLAwKy6xJgEUKy2wPiywMSshIyAgPLAEI0IjOLEmARQrsARDLrAmKy2wPyywABUgR7AAI0KyAAEBFRQTLrAsKi2wQCywABUgR7AAI0KyAAEBFRQTLrAsKi2wQSyxAAEUE7AtKi2wQiywLyotsEMssAAWRSMgLiBGiiNhOLEmARQrLbBELLAII0KwQystsEUssgAAPCstsEYssgABPCstsEcssgEAPCstsEgssgEBPCstsEkssgAAPSstsEossgABPSstsEsssgEAPSstsEwssgEBPSstsE0ssgAAOSstsE4ssgABOSstsE8ssgEAOSstsFAssgEBOSstsFEssgAAOystsFIssgABOystsFMssgEAOystsFQssgEBOystsFUssgAAPistsFYssgABPistsFcssgEAPistsFgssgEBPistsFkssgAAOistsFossgABOistsFsssgEAOistsFwssgEBOistsF0ssDIrLrEmARQrLbBeLLAyK7A2Ky2wXyywMiuwNystsGAssAAWsDIrsDgrLbBhLLAzKy6xJgEUKy2wYiywMyuwNistsGMssDMrsDcrLbBkLLAzK7A4Ky2wZSywNCsusSYBFCstsGYssDQrsDYrLbBnLLA0K7A3Ky2waCywNCuwOCstsGkssDUrLrEmARQrLbBqLLA1K7A2Ky2wayywNSuwNystsGwssDUrsDgrLbBtLCuwCGWwAyRQeLABFTAtAAAAS7gAyFJYsQEBjlm5CAAIAGMgsAEjRLADI3CyBCgJRVJEsgoCByqxBgFEsSQBiFFYsECIWLEGA0SxJgGIUVi4BACIWLEGAURZWVlZuAH/hbAEjbEFAEQAAA==') format('truetype'); font-weight: normal; font-style: normal; } diff --git a/fonts/fontello.svg b/fonts/fontello.svg deleted file mode 100644 index 58293ec65..000000000 --- a/fonts/fontello.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - -Copyright (C) 2014 by original authors @ fontello.com - - - - - - - - \ No newline at end of file diff --git a/fonts/fontello.woff b/fonts/fontello.woff new file mode 100644 index 0000000000000000000000000000000000000000..072ff13f7fe4d1a248f3f6eb3af4836de4cd8033 GIT binary patch literal 2624 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 M0l!_zwm${_56(GrJOBUy literal 0 HcmV?d00001 From ba21dcd12ed2f6e1fb65e815512e3388c1709e56 Mon Sep 17 00:00:00 2001 From: Jason Liu Date: Tue, 17 Jun 2014 14:22:31 -0700 Subject: [PATCH 2/4] Generate link to playground only when icon clicked --- index.html | 2 +- js/editor.js | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index af86051b0..41633d90b 100644 --- a/index.html +++ b/index.html @@ -69,7 +69,7 @@

Featuring

program, accumulator); }
- +
diff --git a/js/editor.js b/js/editor.js index 20ac75179..0a089e845 100644 --- a/js/editor.js +++ b/js/editor.js @@ -122,11 +122,11 @@ function handleResult(statusCode, message) { } } -// Called on successful program run: display output and link to playground +// Called on successful program run: display output and playground icon function handleSuccess(message) { resultDiv.style.backgroundColor = successColor; var program = encodeURIComponent(editor.getValue()); - playLink.href = "http://play.rust-lang.org/?code=" + program + "&run=1" + // playLink.href = "http://play.rust-lang.org/?code=" + program + "&run=1" // console.log(playLink.href); resultDiv.innerHTML = ''; // clear resultDiv, then add resultDiv.appendChild(playLink); // playLink icon and message @@ -171,7 +171,7 @@ function handleProblem(message, problem) { // Setting message var program = encodeURIComponent(editor.getValue()); - playLink.href = "http://play.rust-lang.org/?code=" + program + "&run=1" + // playLink.href = "http://play.rust-lang.org/?code=" + program + "&run=1" // console.log(playLink.href); resultDiv.innerHTML = ''; // clear resultDiv, then add resultDiv.appendChild(playLink); // playLink icon and error message @@ -221,6 +221,14 @@ runButton.addEventListener("click", function(ev) { runProgram(program, handleResult); }); +// When clicking on the playground icon, navigate to the playground itself +function goPlayground() { + var program = "http://play.rust-lang.org/?code=" + + encodeURIComponent(editor.getValue()) + "&run=1" + window.location = program + // console.log(program); +} + // Highlight active line when focused editor.on('focus', function() { editor.setHighlightActiveLine(true); From a528c7e97efd0246fa516aa1e33ad03d1baff249 Mon Sep 17 00:00:00 2001 From: Jason Liu Date: Tue, 17 Jun 2014 14:38:49 -0700 Subject: [PATCH 3/4] Standardize whitespace in index.html The whitespace is now 4 spaces for leading
tags and two spaces for indentations. In addition, tabs were removed and replaced with spaces. --- index.html | 107 +++++++++++++++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/index.html b/index.html index 41633d90b..19a9203e1 100644 --- a/index.html +++ b/index.html @@ -10,19 +10,20 @@ that runs blazingly fast, prevents almost all crashes*, and eliminates data races. -
- Show me more! +
+ Show me more!

- - Recommended Version:
- - nightly - (source) - + + Recommended Version:
+ + nightly + (source) - Install + + Install Other Downloads
@@ -47,55 +48,55 @@

Featuring

// This code is editable and runnable! -fn main() { - // A simple integer calculator: - // `+` or `-` means add or subtract by 1 - // `*` or `/` means multiply or divide by 2 - - let program = "+ + * - /"; - let mut accumulator = 0; - - for token in program.chars() { - match token { - '+' => accumulator += 1, - '-' => accumulator -= 1, - '*' => accumulator *= 2, - '/' => accumulator /= 2, - _ => { /* ignore everything else */ } - } - } - - println!("The program \"{}\" calculates the value {}", - program, accumulator); -}
+ fn main() { + // A simple integer calculator: + // `+` or `-` means add or subtract by 1 + // `*` or `/` means multiply or divide by 2 + + let program = "+ + * - /"; + let mut accumulator = 0; + + for token in program.chars() { + match token { + '+' => accumulator += 1, + '-' => accumulator -= 1, + '*' => accumulator *= 2, + '/' => accumulator /= 2, + _ => { /* ignore everything else */ } + } + } + + println!("The program \"{}\" calculates the value {}", + program, accumulator); + }
-
-fn main() {
-    // A simple integer calculator:
-    // `+` or `-` means add or subtract by 1
-    // `*` or `/` means multiply or divide by 2
-
-    let program = "+ + * - /";
-    let mut accumulator = 0;
-
-    for token in program.chars() {
-        match token {
-            '+' => accumulator += 1,
-            '-' => accumulator -= 1,
-            '*' => accumulator *= 2,
-            '/' => accumulator /= 2,
-            _ => { /* ignore everything else */ }
-        }
-    }
-
-    println!("The program \"{}\" calculates the value {}",
-           program, accumulator);
-}
-
+ 
+          fn main() {
+              // A simple integer calculator:
+              // `+` or `-` means add or subtract by 1
+              // `*` or `/` means multiply or divide by 2
+
+              let program = "+ + * - /";
+              let mut accumulator = 0;
+
+              for token in program.chars() {
+                  match token {
+                      '+' => accumulator += 1,
+                      '-' => accumulator -= 1,
+                      '*' => accumulator *= 2,
+                      '/' => accumulator /= 2,
+                      _ => { /* ignore everything else */ }
+                  }
+              }
+
+              println!("The program \"{}\" calculates the value {}",
+                     program, accumulator);
+          }
+
From acf53753d3122dc93078899876115d1996c476c8 Mon Sep 17 00:00:00 2001 From: Jason Liu Date: Tue, 17 Jun 2014 14:44:00 -0700 Subject: [PATCH 4/4] Revert editor whitespace as it is indent-sensitive --- index.html | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/index.html b/index.html index 19a9203e1..475da3e04 100644 --- a/index.html +++ b/index.html @@ -47,28 +47,28 @@

Featuring

-
// This code is editable and runnable! - fn main() { - // A simple integer calculator: - // `+` or `-` means add or subtract by 1 - // `*` or `/` means multiply or divide by 2 - - let program = "+ + * - /"; - let mut accumulator = 0; - - for token in program.chars() { - match token { - '+' => accumulator += 1, - '-' => accumulator -= 1, - '*' => accumulator *= 2, - '/' => accumulator /= 2, - _ => { /* ignore everything else */ } - } - } - - println!("The program \"{}\" calculates the value {}", - program, accumulator); - }
+
// This code is editable and runnable! +fn main() { + // A simple integer calculator: + // `+` or `-` means add or subtract by 1 + // `*` or `/` means multiply or divide by 2 + + let program = "+ + * - /"; + let mut accumulator = 0; + + for token in program.chars() { + match token { + '+' => accumulator += 1, + '-' => accumulator -= 1, + '*' => accumulator *= 2, + '/' => accumulator /= 2, + _ => { /* ignore everything else */ } + } + } + + println!("The program \"{}\" calculates the value {}", + program, accumulator); +}