removing svg images

adam-singer · May 16, 2012 · d0685e9 · d0685e9
1 parent 330f71e
commit d0685e9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 26 deletions.
diff --git a/directoryserver/client/directoryClient/buildit.sh b/directoryserver/client/directoryClient/buildit.sh
@@ -1 +1,2 @@
-dart2js --out=directoryClient.dart.js --verbose directoryClient.dart
+DART2JS=~/Documents/DartEditor/dart/dart-sdk/bin/dart2js
+$DART2JS --out=directoryClient.dart.js --verbose directoryClient.dart
diff --git a/directoryserver/client/directoryClient/directoryClient.dart b/directoryserver/client/directoryClient/directoryClient.dart
@@ -1,16 +1,13 @@
 #import('dart:html');
 #import('dart:json');
 
-var IP = '127.0.0.1';
-var PORT = 8080;
-
 class DirectoryModel {
   WebSocket _ws;
   get ws() => _ws;
   Function onMessage;
 
   void setupWebsocket() {
-    _ws = new WebSocket("ws://127.0.0.1:8080/ws");
+    _ws = new WebSocket("ws://${window.location.host}/ws");
     _ws.on.open.add((a) {
       print("open $a");
     });
@@ -77,7 +74,7 @@ class DirectoryView {
     //<object data="circle1.svg" type="image/svg+xml"></object>
     var s = new Element.html('<object data="images/file-icon.svg" type="image/svg+xml"></object>');
     var f = new Element.html("<div class='g160'></div>");
-    f.elements.add(s);
+    //f.elements.add(s);
     f.elements.add(new Element.html("<br/>"));
     f.elements.add(b);
     f.elements.add(new Element.html("<br/>"));
@@ -93,7 +90,7 @@ class DirectoryView {
     var b = new Element.html("<Button>${dir}</Button>");
     var s = new Element.html('<object data="images/folder-folder.svg" type="image/svg+xml"></object>');
     var f = new Element.html("<div class='g160'></div>");
-    f.elements.add(s);
+    //f.elements.add(s);
     f.elements.add(new Element.html("<br/>"));
     f.elements.add(b);
     f.elements.add(new Element.html("<br/>"));
@@ -130,6 +127,5 @@ void main() {
   DirectoryView _directoryView = new DirectoryView();
   DirectoryModel _directoryModel = new DirectoryModel();
   DirectoryController _directoryController = new DirectoryController(_directoryModel, _directoryView);
-
 }
 
diff --git a/directoryserver/client/directoryClient/directoryClient.dart.js b/directoryserver/client/directoryClient/directoryClient.dart.js
@@ -896,7 +896,7 @@ Isolate.$defineClass("DirectoryModel", "Object", ["onMessage=", "_ws"], {
   }
  },
  setupWebsocket$0: function() {
-  this._ws = $.WebSocket('ws://127.0.0.1:8080/ws');
+  this._ws = $.WebSocket('ws://' + $.stringToString($.window().get$location().get$host()) + '/ws');
   $.add$1(this._ws.get$on().get$open(), new $.Closure9());
   $.add$1(this._ws.get$on().get$close(), new $.Closure10());
   $.add$1(this._ws.get$on().get$message(), new $.Closure11(this));
@@ -913,7 +913,7 @@ Isolate.$defineClass("DirectoryView", "Object", ["_dirInput?", "_directoryContro
   t0.dir_1 = dir;
   var b = $.Element$html('<Button>' + $.stringToString(t0.dir_1) + '</Button>');
   var s = $.Element$html('<object data="images/folder-folder.svg" type="image/svg+xml"></object>');
-  var f = $.Element$html('<div class=\'four columns alpha\'></div>');
+  var f = $.Element$html('<div class=\'g160\'></div>');
   $.add$1(f.get$elements(), s);
   $.add$1(f.get$elements(), $.Element$html('<br/>'));
   $.add$1(f.get$elements(), b);
@@ -927,7 +927,7 @@ Isolate.$defineClass("DirectoryView", "Object", ["_dirInput?", "_directoryContro
   t0.file_1 = file;
   var b = $.Element$html('<Button>' + $.stringToString(t0.file_1) + '</Button>');
   var s = $.Element$html('<object data="images/file-icon.svg" type="image/svg+xml"></object>');
-  var f = $.Element$html('<div class=\'four columns alpha\'></div>');
+  var f = $.Element$html('<div class=\'g160\'></div>');
   $.add$1(f.get$elements(), s);
   $.add$1(f.get$elements(), $.Element$html('<br/>'));
   $.add$1(f.get$elements(), b);
@@ -4634,7 +4634,7 @@ $.$defineNativeClass('AbstractWorker', [], {
  }
 });
 
-$.$defineNativeClass('HTMLAnchorElement', [], {
+$.$defineNativeClass('HTMLAnchorElement', ["host?"], {
  toString$0: function() {
   return this.toString();
  },
@@ -4648,7 +4648,7 @@ $.$defineNativeClass('HTMLAppletElement', [], {
  is$Element: function() { return true; }
 });
 
-$.$defineNativeClass('HTMLAreaElement', [], {
+$.$defineNativeClass('HTMLAreaElement', ["host?"], {
  is$Element: function() { return true; }
 });
 
@@ -5228,7 +5228,7 @@ $.$defineNativeClass('HTMLFormElement', ["length?"], {
  is$Element: function() { return true; }
 });
 
-$.$defineNativeClass('HTMLFrameElement', [], {
+$.$defineNativeClass('HTMLFrameElement', ["location?"], {
  is$Element: function() { return true; }
 });
 
@@ -5582,7 +5582,7 @@ $.$defineNativeClass('HTMLLinkElement', [], {
  is$Element: function() { return true; }
 });
 
-$.$defineNativeClass('Location', [], {
+$.$defineNativeClass('Location', ["host?"], {
  toString$0: function() {
   return this.toString();
  }
@@ -6404,7 +6404,7 @@ $.$defineNativeClass('HTMLShadowElement', [], {
  is$Element: function() { return true; }
 });
 
-$.$defineNativeClass('ShadowRoot', ["innerHTML!"], {
+$.$defineNativeClass('ShadowRoot', ["innerHTML!", "host?"], {
  is$Element: function() { return true; }
 });
 
@@ -6841,7 +6841,7 @@ $.$defineNativeClass('WebSocket', [], {
  }
 });
 
-$.$defineNativeClass('DOMWindow', ["navigator?", "length?"], {
+$.$defineNativeClass('DOMWindow', ["navigator?", "location?", "length?"], {
  open$3: function(url, name, options) {
   return this.open(url,name,options);
  },
@@ -6864,7 +6864,7 @@ $.$defineNativeClass('Worker', [], {
  }
 });
 
-$.$defineNativeClass('WorkerContext', ["navigator?"], {
+$.$defineNativeClass('WorkerContext', ["navigator?", "location?"], {
  close$0: function() {
   return this.close();
  },
@@ -6881,7 +6881,7 @@ $.$defineNativeClass('WorkerContext', ["navigator?"], {
  }
 });
 
-$.$defineNativeClass('WorkerLocation', [], {
+$.$defineNativeClass('WorkerLocation', ["host?"], {
  toString$0: function() {
   return this.toString();
  }

diff --git a/directoryserver/server/directoryserver.dart b/directoryserver/server/directoryserver.dart
@@ -1,9 +1,8 @@
 #import('dart:io');
 #import('dart:json');
 
-var IP = '127.0.0.1';
-var PORT = 8080;
-
+final IP = '127.0.0.1';
+final PORT = 8080;
 
 Future<String> listDirectoryJson(path) {
   Completer c = new Completer();
@@ -25,7 +24,6 @@ Future<String> listDirectoryJson(path) {
   dl.onDone = (done) {    
     var f = {"files": files, "dirs": dirs, "cwd": cwd};
     c.complete(JSON.stringify(f));
-
   };
 
   dl.onError = (e) { 
@@ -48,9 +46,6 @@ void main() {
   staticFiles["/directoryClient.dart.js"] = "../client/directoryClient/directoryClient.dart.js";
   staticFiles["/images/file-icon.svg"] = "../client/directoryClient/images/file-icon.svg";
   staticFiles["/images/folder-folder.svg"] = "../client/directoryClient/images/folder-folder.svg";
-  staticFiles["/stylesheets/base.css"] = "../client/directoryClient/stylesheets/base.css";
-  staticFiles["/stylesheets/layout.css"] = "../client/directoryClient/stylesheets/layout.css";
-  staticFiles["/stylesheets/skeleton.css"] = "../client/directoryClient/stylesheets/skeleton.css";
   staticFiles["/stylesheets/golden-min.css"] = "../client/directoryClient/stylesheets/golden-min.css";
 
   staticFiles.forEach((k,v) {