From 209f98a88e972fad71e9692f31b9a4ca43a1229c Mon Sep 17 00:00:00 2001
From: "windhamwong@nva-hk.com" <windhamwong@nva-hk.com>
Date: Wed, 7 Jun 2017 15:14:19 +0100
Subject: [PATCH] Fixing recipe location removing Google analysis fixing
 package, pulling from master

---
 package.json                            |  3 ---
 src/core/config/OperationConfig.js      |  3 ++-
 src/{js => core}/operations/nTcpdump.js |  6 +++++-
 src/web/static/ga.html                  | 12 ------------
 4 files changed, 7 insertions(+), 17 deletions(-)
 rename src/{js => core}/operations/nTcpdump.js (98%)

diff --git a/package.json b/package.json
index fd04c7dd..4ad37565 100644
--- a/package.json
+++ b/package.json
@@ -92,8 +92,5 @@
     "build": "grunt prod",
     "test": "grunt test",
     "docs": "grunt docs"
-  },
-  "dependencies": {
-    "grunt-cli": "^1.2.0"
   }
 }
diff --git a/src/core/config/OperationConfig.js b/src/core/config/OperationConfig.js
index 58b2262a..125e5525 100755
--- a/src/core/config/OperationConfig.js
+++ b/src/core/config/OperationConfig.js
@@ -38,6 +38,7 @@ import Unicode from "../operations/Unicode.js";
 import URL_ from "../operations/URL.js";
 import UUID from "../operations/UUID.js";
 
+import nTcpdump from "../operations/nTcpdump.js";
 
 /**
  * Type definition for an OpConf.
@@ -614,7 +615,7 @@ const OperationConfig = {
         ]
     },
     "From nTcpdump": {
-        description: "For Tcpdump conversion only. (nva-hk)",
+        description: "For Tcpdump conversion only.",
         run: nTcpdump.runFrom,
         highlight: nTcpdump.highlightFrom,
         highlightReverse: nTcpdump.highlightTo,
diff --git a/src/js/operations/nTcpdump.js b/src/core/operations/nTcpdump.js
similarity index 98%
rename from src/js/operations/nTcpdump.js
rename to src/core/operations/nTcpdump.js
index ec250505..bcdabaed 100644
--- a/src/js/operations/nTcpdump.js
+++ b/src/core/operations/nTcpdump.js
@@ -1,4 +1,6 @@
 /* globals app */
+import Utils from "../Utils.js";
+
 
 /**
  * Hexdump operations.
@@ -9,7 +11,7 @@
  *
  * @namespace
  */
-var nTcpdump = {
+const nTcpdump = {
 
     /**
      * @constant
@@ -198,3 +200,5 @@ var nTcpdump = {
     },
 
 };
+
+export default nTcpdump;
diff --git a/src/web/static/ga.html b/src/web/static/ga.html
index f70b9c3a..378d18ea 100644
--- a/src/web/static/ga.html
+++ b/src/web/static/ga.html
@@ -1,18 +1,6 @@
 
 
 <!-- Begin Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
-  ga('create', 'UA-85682716-2', 'auto');
-
-  // Specifying location.pathname here overrides the default URL which would include arguments.
-  // This method prevents Google Analytics from logging any recipe or input data in the URL.
-  ga('send', 'pageview', location.pathname);
-
-</script>
 <!-- End Google Analytics -->