Revert "Add a couple wrapper functions for base64 encoding client sid…

…e to start fixing #338" This reverts commit d9fd430.
hawtio · May 10, 2013 · 912fcb3 · 912fcb3
1 parent 3c9ae45
commit 912fcb3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 200 deletions.
diff --git a/hawtio-web/src/main/webapp/app/core/js/helpers.ts b/hawtio-web/src/main/webapp/app/core/js/helpers.ts
@@ -1,6 +1,3 @@
-
-declare var base64:any;
-
 var logQueryMBean = 'org.fusesource.insight:type=LogQuery';
 
 var _urlPrefix: string = null;
@@ -758,19 +755,4 @@ module Core {
     }
     return entries;
   }
-
-  export function decode(s) {
-    if (!window.atob) {
-      return base64.decode(s);
-    }
-    return window.atob(s);
-  }
-
-  export function encode(b) {
-    if (!window.btoa) {
-      return base64.encode(b);
-    }
-    return window.btoa(b);
-  }
-
 }
diff --git a/hawtio-web/src/main/webapp/index.html b/hawtio-web/src/main/webapp/index.html
@@ -161,6 +161,8 @@
 
 <script type="text/javascript" src="app/core/js/hawtio-plugin-loader.js"></script>
 
+<script type="text/javascript" src="app/app.js"></script>
+
 <!-- camel model definition -->
 <script type="text/javascript" src="app/camel/js/camelModel.js"></script>
 
@@ -176,12 +178,6 @@
 <!-- JBoss DMR -->
 <script type="text/javascript" src="lib/dmr.js.nocache.js"></script>
 
-<!-- Base64 support for browsers that don't have it built in -->
-<script type="text/javascript" src="lib/base64.js"></script>
-
-<!-- main app -->
-<script type="text/javascript" src="app/app.js"></script>
-
 <!-- google maps -->
 <script src="http://maps.googleapis.com/maps/api/js?sensor=false" type="text/javascript"></script>
 

diff --git a/hawtio-web/src/main/webapp/lib/base64.js b/hawtio-web/src/main/webapp/lib/base64.js