Skip to content

Commit f1254f6

Browse files
GordonSmithGordonSmith
committed
Merge branch 'candidate-1.12.0' into candidate-1.14.0
# Conflicts: # src/config.js # src/configRawGit.json
2 parents 7b7a0e2 + e853ec0 commit f1254f6

File tree

107 files changed

+439
-7661
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+439
-7661
lines changed

‎.jshintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"predef": [ "define", "colorbrewer", "google", "Promise" ],
2+
"predef": [ "define", "colorbrewer", "google", "Promise", "AmCharts", "simpleheat", "require" ],
33

44
// JSHint Default Configuration File (as on JSHint website)
55
// See http://jshint.com/docs/ for more details

‎apps/legacyDash.html

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,12 @@
33
<head>
44
<meta charset="utf-8">
55
<script src="../dist-amd/hpcc-viz.js"></script>
6-
<script src="../dist-amd/hpcc-bundles.js"></script>
7-
<script>
8-
require.config({
9-
paths: {
10-
"font-awesome": "../dist-amd/font-awesome/css/font-awesome.min",
11-
"src": "../dist-amd"
12-
}
13-
});
14-
</script>
156
<!--
16-
<script src="http://rawgit.com/jrburke/requirejs/2.1.17/require.js"></script>
17-
<script src="../src/config.js"></script>
7+
<script src="http://rawgit.com/jrburke/requirejs/2.2.0/require.js"></script>
8+
<script src="../src/loader.js"></script>
189
-->
1910
<!--
2011
<script src="../dist-amd/hpcc-viz.js"></script>
21-
<script src="../dist-amd/hpcc-bundles.js"></script>
22-
<script>
23-
require.config({
24-
paths: {
25-
"font-awesome": "../dist-amd/font-awesome/css/font-awesome.min",
26-
"src": "../dist-amd"
27-
}
28-
});
29-
</script>
3012
-->
3113
</head>
3214
<body>

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"resolutions": {
5252
"d3": "~3.5.16"
5353
},
54-
"license": "Apache",
54+
"license": "Apache-2.0",
5555
"authors": [
5656
"HPCC Systems"
5757
]

‎demos/DataAnalyst/index.html

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html>
22
<html>
33
<head>
44
<meta charset="utf-8">
55
<title>Data Analyst</title>
66
<link rel="stylesheet" href="css/style.css">
77
<link rel="stylesheet" href="css/graph.css">
8-
<!--
9-
<script src="../../bower_components/requirejs/require.js"></script>
10-
-->
11-
<script src="http://rawgit.com/jrburke/requirejs/2.1.17/require.js"></script>
12-
<script src="../../src/config.js"></script>
13-
<script>
14-
requirejs.config({
15-
baseUrl: ".."
16-
});
17-
</script>
8+
<script src="http://rawgit.com/jrburke/requirejs/2.2.0/require.js"></script>
9+
<script src="../../src/loader.js"></script>
10+
<!-- Uncomment for github
11+
<script src="http://rawgit.com/jrburke/requirejs/2.2.0/require.js"></script>
12+
<script src="../../src/loader.js"></script>
13+
-->
14+
<!-- Uncomment to develop
15+
<script src="../node_modules/requirejs/require.js"></script>
16+
<script src="../../src/loader.js"></script>
17+
-->
18+
<!-- Uncomment to test build
19+
<script src="../../dist-amd/hpcc-viz.js"></script>
20+
-->
1821
</head>
1922
<body onresize="doResize();">
2023
<div id="main" style="width:100%; height:100vh; margin-top:0px; padding:8px; overflow:hidden">

‎demos/DataAnalyst/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require(
1111
"src/other/Table", "src/other/Comms",
1212
"src/map/ChoroplethStates",
1313
"src/c3chart/Gauge",
14-
"./DataAnalyst/sample_breach"
14+
"./sample_breach"
1515
],
1616
function (Border, Grid, Tabbed,
1717
Form, Input, TextArea,

‎demos/dashboard/app/Main.js

Lines changed: 0 additions & 150 deletions
This file was deleted.

‎demos/dashboard/app/app.js

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎demos/dashboard/app/tpl/Main.html

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎demos/dashboard/databomb.html

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)