https://src.bluestatic.org / armadillo.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0762dae)
Revert "Add logic to handle remote service requests by serving a separate HTML front...
authorRobert Sesek <rsesek@bluestatic.org>
Sat, 16 Apr 2011 17:08:37 +0000 (13:08 -0400)
committerRobert Sesek <rsesek@bluestatic.org>
Sat, 16 Apr 2011 17:08:37 +0000 (13:08 -0400)
This reverts commit 0762dae47cfc0c781069a346c3af55292fc97779.

build.py patch | blob | history
src/server.go patch | blob | history
web_frontend/index.html patch | blob | history
web_frontend/main.js patch | blob | history
web_frontend/service_request.html [deleted file] patch | blob | history

diff --git a/build.py b/build.py
index 7c99ec9e87017428a74d1355c4dcee2a38d74a25..18b0346037f106953f4216d15f8d553780a81678 100755 (executable)
--- a/build.py
+++ b/build.py
@@ -45,7 +45,6 @@ SOURCES_FE = [
 ]
 RESOURCES_FE = [
   'index.html',
-  'service_request.html',
   'screen.css',
   'reset.css'
 ]
diff --git a/src/server.go b/src/server.go
index 9cefd5f31f0fc1f58fd519c0fd2367d8a367b8cd..07674a00088a55cc597753631cfcbe0b45583f6c 100644 (file)
--- a/src/server.go
+++ b/src/server.go
@@ -1,6 +1,6 @@
 //
 // Armadillo File Manager
-// Copyright (c) 2010-2011, Robert Sesek <http://www.bluestatic.org>
+// Copyright (c) 2010, Robert Sesek <http://www.bluestatic.org>
 // 
 // This program is free software: you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free Software
@@ -27,11 +27,7 @@ var kFrontEndFiles string = path.Join(dir, "fe")
 var gConfig *config.Configuration = nil
 
 func indexHandler(response http.ResponseWriter, request *http.Request) {
-  var fileName string = "index.html"
-  if strings.HasPrefix(request.URL.Path, "/_@/") {
-    fileName = "service_request.html"
-  }
-  fd, err := os.Open(path.Join(kFrontEndFiles, fileName), os.O_RDONLY, 0)
+  fd, err := os.Open(path.Join(kFrontEndFiles, "index.html"), os.O_RDONLY, 0)
   if err != nil {
     fmt.Print("Error opening file ", err.String(), "\n")
     return
diff --git a/web_frontend/index.html b/web_frontend/index.html
index 9253b46854db59c1c93402c26de8f3db88d65d8d..e733bd0a7afd0a887654c0cf5da58bea8923e7fa 100644 (file)
--- a/web_frontend/index.html
+++ b/web_frontend/index.html
@@ -20,7 +20,6 @@
 
     <script type="text/javascript" charset="utf-8">
       var app = new armadillo.App();
-      app.frontEndMain();
     </script>
   </body>
 </html>
\ No newline at end of file
diff --git a/web_frontend/main.js b/web_frontend/main.js
index de6638d17ababe0b24e74a9531cce7db56879334..1855a1be01c385ec0003c3b48f8910a094232c5b 100644 (file)
--- a/web_frontend/main.js
+++ b/web_frontend/main.js
@@ -1,6 +1,6 @@
 //
 // Armadillo File Manager
-// Copyright (c) 2010-2011, Robert Sesek <http://www.bluestatic.org>
+// Copyright (c) 2010, Robert Sesek <http://www.bluestatic.org>
 // 
 // This program is free software: you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free Software
@@ -21,12 +21,6 @@ goog.require('goog.string.format');
 goog.require('goog.Uri.QueryData');
 
 armadillo.App = function() {
-}
-
-/**
- * Runs the main front end.
- */
-armadillo.App.prototype.frontEndMain = function() {
   var start_path = '/';
   if (window.location.hash) {
     start_path = window.location.hash.substr(1);
@@ -41,16 +35,7 @@ armadillo.App.prototype.frontEndMain = function() {
       armadillo.Version.MAJOR, armadillo.Version.MINOR,
       armadillo.Version.BUILD);
   goog.dom.setTextContent(goog.dom.getElement('footer'), version)
-};
-
-/**
- * Performs a remote service request, which is essentially an API call that uses
- * the JavaScript frontend rather than the backend.
- */
-armadillo.App.prototype.serviceRequestMain = function() {
-  document.write(window.location);
-  console.log(window.location);
-};
+}
 
 /**
  * Starts a new XHR service request from the backend.
diff --git a/web_frontend/service_request.html b/web_frontend/service_request.html
deleted file mode 100644 (file)
index 6475a4e..0000000
--- a/web_frontend/service_request.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-  <script type="text/javascript">
-    var CLOSURE_NO_DEPS = true;
-  </script>
-  <script type="text/javascript" src="/fe/armadillo.js"></script>
-  <script type="text/javascript" charset="utf-8">
-    var app = new armadillo.App();
-    app.serviceRequestMain();
-  </script>
-</html>
\ No newline at end of file
A web-based file manager that allows you to manage a file system from your browser.