Permalink
Browse files

include tablesorter, remove old stuff

  • Loading branch information...
1 parent 17973d0 commit 7e36c607ebae39bb4ce7d3d41fff8313dfb75d66 @mhils committed Sep 3, 2012
Showing with 7 additions and 39 deletions.
  1. +0 −34 gui/index.html
  2. +1 −2 gui/js/HoneyProxy/TableSorter.js
  3. +6 −3 gui/js/HoneyProxy/main.js
View
34 gui/index.html
@@ -125,40 +125,6 @@
<script src="./js/lib/prettify/prettify.js"></script>
<script src="./js/lib/prettify/lang-css.js"></script>
<script src="./js/lib/dojo/dojo.js" data-dojo-config="async: true"></script>
-
-
-<!-- ugly. remove closure dependency and move to amd modules ASAP!
-<script>HoneyProxy = {flowModels:[]};</script>
-<script src="./js/HoneyProxy/models/Flow.js"></script>
-<script src="./js/HoneyProxy/template.js"></script>
-
-<script src="./js/HoneyProxy/flows/DocumentFlow.js"></script>
-<script src="./js/HoneyProxy/flows/PrettyFlow.js"></script>
-<script src="./js/HoneyProxy/flows/CssFlow.js"></script>
-<script src="./js/HoneyProxy/flows/JsFlow.js"></script>
-<script src="./js/HoneyProxy/flows/XmlFlow.js"></script>
-<script src="./js/HoneyProxy/flows/HtmlFlow.js"></script>
-<script src="./js/HoneyProxy/flows/ImageFlow.js"></script>
-
-<script src="./js/HoneyProxy/models/Traffic.js"></script>
-<script src="./js/HoneyProxy/HoneyProxy.js"></script>
-<script src="./js/HoneyProxy/utilities.js"></script>
-<script src="./js/HoneyProxy/websocket.js"></script>
-<script src="./js/HoneyProxy/Config.js"></script>
-
-<script src="./js/HoneyProxy/models/sharedFlowProperties.js"></script>
-<script src="./js/HoneyProxy/models/Request.js"></script>
-<script src="./js/HoneyProxy/models/Response.js"></script>
-
-<script src="./js/HoneyProxy/views/FlowView.js"></script>
-
-<script src="./js/HoneyProxy/views/TrafficView.js"></script>
-<script src="./js/HoneyProxy/TableSorter.js"></script>
-<script src="./js/HoneyProxy/views/DetailView.js"></script>
-<script src="./js/HoneyProxy/popOut.js"></script>
-<script src="./js/HoneyProxy/dirdump.js"></script>
-<script src="./js/HoneyProxy/tutorial.js"></script>
-<script src="./js/HoneyProxy/search.js"></script> -->
<script src="./js/HoneyProxy/main.js"></script>
View
3 gui/js/HoneyProxy/TableSorter.js
@@ -14,8 +14,6 @@ define(["dojo/domReady!"],function(){
trafficTableSorter.setSortFunction(3, goog.ui.TableSorter.numericSort);
trafficTableSorter.setSortFunction(5, goog.ui.TableSorter.createReverseSort(goog.ui.TableSorter.numericSort));
- HoneyProxy.trafficTableSorter = trafficTableSorter;
-
/**
* Table Sorter Proxy -
* proxy click events to the second table.
@@ -28,4 +26,5 @@ define(["dojo/domReady!"],function(){
$(this).addClass(toProxy.attr('class'));
});
+ return trafficTableSorter;
});
View
9 gui/js/HoneyProxy/main.js
@@ -1,15 +1,18 @@
require({
packages:[{
name:"HoneyProxy",
- location:"../../HoneyProxy"
+ location:"../../HoneyProxy",
+ tlmSiblingOfDojo: false
}]
},
["HoneyProxy/MainLayout",
"HoneyProxy/websocket",
"HoneyProxy/traffic",
"HoneyProxy/tutorial",
- "HoneyProxy/search"], function(MainLayout,websocket,traffic) {
- //HoneyProxy.MainLayout = MainLayout;
+ "HoneyProxy/search",
+ "HoneyProxy/dirdump",
+ "HoneyProxy/TableSorter",
+ "HoneyProxy/popOut"], function(MainLayout,websocket,traffic) {
websocket.on("authenticated",function(){
traffic.fetch();
});

0 comments on commit 7e36c60

Please sign in to comment.