Merge remote-tracking branch 'upstream/master'

lm · Mar 12, 2012 · 0234566 · 0234566
2 parents 1038957 + 10ee59d
commit 0234566
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/css/amber.css b/css/amber.css
@@ -225,17 +225,17 @@ body.jtalkBody {
 .jtalkTool textarea,
 .jtalkTool input {
     border: 0 none;
-    font-family: Arial, Helvetica, sans;
+    font-family:  "DejaVu Sans", Helvetica, sans;
     line-height: 1.3em;
-    font-size: 12px;
+    font-size: 11px;
     position: relative;
     padding: 0;
 }
 
 .jtalkTool .CodeMirror {
     border: 0 none;
-    font-family: Arial, Helvetica, sans;
-    font-size: 12px;
+    font-family:  "DejaVu Sans", Helvetica, sans;
+    font-size: 11px;
     line-height: 1.3em;
     height: 100%;
     background: white;
@@ -246,7 +246,7 @@ body.jtalkBody {
 }
 
 .talkTool .CodeMirror-scroll pre {
-    font-family: Arial, Helvetica, sans;
+    font-family: "DejaVu Sans", Helvetica, sans;
 }
 
 .jtalkTool .jt_clear {	 

diff --git a/js/amber.js b/js/amber.js
@@ -12,14 +12,14 @@ amber = (function() {
 	var scripts = document.getElementsByTagName("script");
 	var src     = scripts[ scripts.length - 1 ].src;
 	var home    = src.split("/").slice(0, -2).join("/") + "/";
-	var nocache = '?' + (new Date()).getTime();
 
 	var debug;
 	var deploy;
 
 	var spec;
 	var jsToLoad = [];
 	var loadJS;
+    var nocache = '';
 
 	that.toggleIDE = function() {
 		if ($('#jtalk').length == 0) {

diff --git a/js/init.js b/js/init.js
@@ -1,5 +1,6 @@
 smalltalk.init(smalltalk.Object);
-smalltalk.classes()._do_(function(each) {each._initialize()});
+smalltalk.classes()._do_(function(each) {
+	each._initialize()});
 
 /* Similar to jQuery(document).ready() */