diff --git a/bower.json b/bower.json
index fe8ee28436cf162cd1025b719a8391a1eeae5e88..ce793bb7faabcb0b0158b297f8a047ad4ca7da33 100644
--- a/bower.json
+++ b/bower.json
@@ -1,18 +1,21 @@
{
- "name": "Aider",
- "version": "1.0.0",
- "dependencies": {
- "angular": "latest",
- "normalize.css": "latest",
- "font-awesome": "latest",
- "primer-css": "latest",
- "angular-dropdowns": "latest",
- "headroom.js": "latest",
- "modernizr": "latest",
- "angular-ui-router": "latest",
- "angularjs-nvd3-directives": "latest"
- },
- "resolutions": {
- "d3": "~3.4.1"
- }
+ "name": "Aider",
+ "version": "1.0.0",
+ "dependencies": {
+ "angular": "latest",
+ "normalize.css": "latest",
+ "font-awesome": "latest",
+ "primer-css": "latest",
+ "angular-dropdowns": "latest",
+ "headroom.js": "latest",
+ "modernizr": "latest",
+ "angular-ui-router": "latest",
+ "angularjs-nvd3-directives": "latest",
+ "angular-highlightjs": "latest",
+ "highlightjs-line-numbers.js": "latest",
+ "highlightjs": "latest"
+ },
+ "resolutions": {
+ "d3": "~3.4.1"
+ }
}
diff --git a/build-copyfiles.sh b/build-copyfiles.sh
index 8c6bdee311cc1b1df12c7594582a8679197ed473..750798c893754dd228eeeb6df01f01f150cfb49a 100755
--- a/build-copyfiles.sh
+++ b/build-copyfiles.sh
@@ -1,10 +1,16 @@
#!/bin/sh
+
+# Make the directories
mkdir -p dist/js/vendor
mkdir -p dist/css
mkdir -p dist/fonts
+
+#copy the fonts
cp -f bower_components/octicons/octicons/octicons.ttf dist/css
cp -f bower_components/octicons/octicons/octicons.woff dist/css
cp -f bower_components/font-awesome/fonts/* dist/fonts
+
+#copy the javascript
cp bower_components/angular/angular.min.js dist/js/vendor
cp bower_components/angular-ui-router/release/angular-ui-router.js dist/js/vendor
cp bower_components/angular-dropdowns/dist/angular-dropdowns.min.js dist/js/vendor
@@ -14,3 +20,6 @@ cp bower_components/modernizr/modernizr.js dist/js/vendor
cp bower_components/d3/d3.min.js dist/js/vendor
cp bower_components/nvd3/nv.d3.min.js dist/js/vendor
cp bower_components/angularjs-nvd3-directives/dist/angularjs-nvd3-directives.min.js dist/js/vendor
+cp bower_components/highlightjs/highlight.pack.js dist/js/vendor
+cp bower_components/angular-highlightjs/angular-highlightjs.min.js dist/js/vendor
+cp bower_components/highlightjs-line-numbers.js/dist/highlightjs-line-numbers.min.js dist/js/vendor
diff --git a/dist/index.html b/dist/index.html
index 7de1ba787825091c371852fd44f02bc415e67c78..71e9dd2b293114295b94980df79c5a6f5f68c345 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -8,15 +8,21 @@
<link rel="stylesheet" href="css/main.css">
+ <!-- 3rd party javascript -->
+ <script src="js/vendor/modernizr.js"></script>
+ <script src="js/vendor/d3.min.js"></script>
+ <script src="js/vendor/nv.d3.min.js"></script>
+ <script src="js/vendor/headroom.min.js"></script>
+ <script src="js/vendor/highlight.pack.js"></script>
+ <script src="js/vendor/highlightjs-line-numbers.min.js"></script>
+
+ <!-- Angular javascript -->
<script src="js/vendor/angular.min.js"></script>
<script src="js/vendor/angular-ui-router.js"></script>
<script src="js/vendor/angular-dropdowns.min.js"></script>
- <script src="js/vendor/headroom.min.js"></script>
<script src="js/vendor/angular.headroom.min.js"></script>
- <script src="js/vendor/modernizr.js"></script>
- <script src="js/vendor/d3.min.js"></script>
- <script src="js/vendor/nv.d3.min.js"></script>
<script src="js/vendor/angularjs-nvd3-directives.min.js"></script>
+ <script src="js/vendor/angular-highlightjs.min.js"></script>
</head>
<body ng-app="myApp">
<!--[if lt IE 8]>
diff --git a/dist/js/app.js b/dist/js/app.js
index aa283da5bf183a745c20180c08b6d717e5ab52e9..dc422855eb9594fcaf1acaa37b4062eeefe35522 100644
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -1,4 +1,4 @@
-var app = angular.module('myApp', ['ui.router', 'ngDropdowns', 'headroom', 'nvd3ChartDirectives']);
+var app = angular.module('myApp', ['ui.router', 'ngDropdowns', 'headroom', 'nvd3ChartDirectives', 'hljs']);
app.config(function ($stateProvider, $urlRouterProvider) {
$stateProvider
diff --git a/dist/js/controllers/analyzer.endpoints.js b/dist/js/controllers/analyzer.endpoints.js
index 6a48271df6098291390012476a92139a08af324a..cb2e5cac255f14a447d216dbc913e63b0fbc2ab5 100644
--- a/dist/js/controllers/analyzer.endpoints.js
+++ b/dist/js/controllers/analyzer.endpoints.js
@@ -1,4 +1,4 @@
-app.controller('analyzer.endpoints', ['$scope', 'analyzerNav', function ($scope, analyzerNav) {
+app.controller('analyzer.endpoints', ['$scope', 'analyzerNav', '$parse', function ($scope, analyzerNav, $parse) {
analyzerNav.navSelected = "endpoints";
$scope.datapoints = [
@@ -86,4 +86,20 @@ app.controller('analyzer.endpoints', ['$scope', 'analyzerNav', function ($scope,
"states": ["Citizen", "Green Card Holder", "Visa Holder", "Other"]
}
];
+
+ $scope.prettyDatapoints = function() {
+ var datapointsJson = "{";
+ for( x in $scope.datapoints ) {
+ datapointsJson += "\"" + $scope.datapoints[x].key + "\" : \"Hello World\",";
+ }
+ datapointsJson += "}";
+
+ return $scope.toPrettyJSON(datapointsJson, 4);
+ };
+
+ $scope.toPrettyJSON = function (jsonStr, tabWidth) {
+ var parsedStr = $parse(jsonStr)({});
+ var result = JSON.stringify(parsedStr, null, Number(tabWidth));
+ return result;
+ };
}]);
diff --git a/dist/views/analyzer.endpoints.html b/dist/views/analyzer.endpoints.html
index 9cf22701bc1877d5871cf82fdd6c6a20e0aff853..02f8fef8cbf58fb4cfbd123f360abf938d5e3dd6 100644
--- a/dist/views/analyzer.endpoints.html
+++ b/dist/views/analyzer.endpoints.html
@@ -24,9 +24,7 @@
<hr/>
<div style="padding-bottom: 10px;">Request example</div>
<div>Content-Type: application/json</div>
- <div>{</div>
- <div ng-repeat="datapoint in datapoints" style="padding-left: 20px;">"{{datapoint.key}}": "Hello world",</div>
- <div>}</div>
+ <div hljs source="prettyDatapoints()"></div>
<hr/>
<div style="padding-bottom: 10px;">Response example</div>
<div><span>201</span> Datapoint successfully recorded.</div>
@@ -63,9 +61,7 @@
<hr/>
<div style="padding-bottom: 10px;">Request example</div>
<div>Content-Type: application/json</div>
- <div>{</div>
- <div ng-repeat="datapoint in datapoints" style="padding-left: 20px;">"{{datapoint.key}}": "Hello world",</div>
- <div>}</div>
+ <div hljs source="prettyDatapoints()"></div>
<hr/>
<div style="padding-bottom: 10px;">Response example</div>
<div><span>201</span> Datapoint successfully recorded.</div>
@@ -103,9 +99,7 @@
<hr/>
<div style="padding-bottom: 10px;">Request example</div>
<div>Content-Type: application/json</div>
- <div>{</div>
- <div ng-repeat="datapoint in datapoints" style="padding-left: 20px;">"{{datapoint.key}}": "Hello world",</div>
- <div>}</div>
+ <div hljs source="prettyDatapoints()"></div>
<hr/>
<div style="padding-bottom: 10px;">Response example</div>
<div><span>201</span> Datapoint successfully recorded.</div>
@@ -142,9 +136,7 @@
<hr/>
<div style="padding-bottom: 10px;">Request example</div>
<div>Content-Type: application/json</div>
- <div>{</div>
- <div ng-repeat="datapoint in datapoints" style="padding-left: 20px;">"{{datapoint.key}}": "Hello world",</div>
- <div>}</div>
+ <div hljs source="prettyDatapoints()"></div>
<hr/>
<div style="padding-bottom: 10px;">Response example</div>
<div><span>201</span> Datapoint successfully recorded.</div>
diff --git a/scss/main.scss b/scss/main.scss
index c587d22d6e97c7c2b7bc80df640db8ac47e1b90b..0854cceea0a8037d57c3d208074dadb72765a7f1 100644
--- a/scss/main.scss
+++ b/scss/main.scss
@@ -4,6 +4,7 @@
@import "../bower_components/nvd3/nv.d3.min.css";
@import "../bower_components/octicons/octicons/octicons";
@import '../bower_components/primer-css/scss/primer';
+@import "../bower_components/highlightjs/styles/default.css";
@import 'crossbrowser';
@import "headroom-animate";
@@ -508,3 +509,15 @@ footer div {
padding-right: 10px;
padding-top: 10px;
}
+
+.hljs-line-numbers {
+ text-align: right;
+ border-right: 1px solid #ccc;
+ color: #999;
+ -webkit-touch-callout: none;
+ -webkit-user-select: none;
+ -khtml-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}