mirror of
https://github.com/seigler/dash-website
synced 2025-07-27 07:16:10 +00:00
Refactors JS & Fixes
"Uncaught TypeError: Cannot read property 'siteApi' of undefined" error.
This commit is contained in:
parent
00010a3a58
commit
fe72accf9b
4 changed files with 19 additions and 27 deletions
5
_includes/globals_js_data.html
Normal file
5
_includes/globals_js_data.html
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
<script>
|
||||||
|
window.globals = {
|
||||||
|
siteApi : "{{ site.api }}"
|
||||||
|
};
|
||||||
|
</script>
|
|
@ -34,22 +34,7 @@
|
||||||
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js" integrity="sha384-CgeP3wqr9h5YanePjYLENwCTSSEz42NJkbFpAFgHWQz7u3Zk8D00752ScNpXqGjS" crossorigin="anonymous"></script>
|
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js" integrity="sha384-CgeP3wqr9h5YanePjYLENwCTSSEz42NJkbFpAFgHWQz7u3Zk8D00752ScNpXqGjS" crossorigin="anonymous"></script>
|
||||||
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery.matchHeight/0.7.0/jquery.matchHeight-min.js" integrity="sha384-dfOR5hjVOg6B2OvgyHIS71mJWX5TgNQeFGo5cNNVglSep7ZvYcByrpEya6xbwwyB" crossorigin="anonymous"></script>
|
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery.matchHeight/0.7.0/jquery.matchHeight-min.js" integrity="sha384-dfOR5hjVOg6B2OvgyHIS71mJWX5TgNQeFGo5cNNVglSep7ZvYcByrpEya6xbwwyB" crossorigin="anonymous"></script>
|
||||||
<script src="/dist/js/main.min.js"></script>
|
<script src="/dist/js/main.min.js"></script>
|
||||||
<script>
|
{% include globals_js_data.html %}
|
||||||
window.globals = {
|
|
||||||
siteApi : "{{ site.api }}"
|
|
||||||
};
|
|
||||||
|
|
||||||
////////
|
|
||||||
function formatNumber (num) {
|
|
||||||
return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,")
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatCurrency (num,decimal) {
|
|
||||||
var _decimal;
|
|
||||||
_decimal = typeof decimal !== "undefined" ? decimal : 2;
|
|
||||||
return parseFloat(num).toFixed(_decimal).replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,")
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -74,17 +74,7 @@
|
||||||
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js" integrity="sha384-CgeP3wqr9h5YanePjYLENwCTSSEz42NJkbFpAFgHWQz7u3Zk8D00752ScNpXqGjS" crossorigin="anonymous"></script>
|
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js" integrity="sha384-CgeP3wqr9h5YanePjYLENwCTSSEz42NJkbFpAFgHWQz7u3Zk8D00752ScNpXqGjS" crossorigin="anonymous"></script>
|
||||||
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery.matchHeight/0.7.0/jquery.matchHeight-min.js" integrity="sha384-dfOR5hjVOg6B2OvgyHIS71mJWX5TgNQeFGo5cNNVglSep7ZvYcByrpEya6xbwwyB" crossorigin="anonymous"></script>
|
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery.matchHeight/0.7.0/jquery.matchHeight-min.js" integrity="sha384-dfOR5hjVOg6B2OvgyHIS71mJWX5TgNQeFGo5cNNVglSep7ZvYcByrpEya6xbwwyB" crossorigin="anonymous"></script>
|
||||||
<script src="/dist/js/main.min.js"></script>
|
<script src="/dist/js/main.min.js"></script>
|
||||||
<script>
|
{% include globals_js_data.html %}
|
||||||
function formatNumber (num) {
|
|
||||||
return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,")
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatCurrency (num,decimal) {
|
|
||||||
var _decimal;
|
|
||||||
_decimal = typeof decimal !== "undefined" ? decimal : 2;
|
|
||||||
return parseFloat(num).toFixed(_decimal).replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,")
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
12
src/js/globals.js
Normal file
12
src/js/globals.js
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
/**
|
||||||
|
* Created by cwilliams on 5/4/17.
|
||||||
|
*/
|
||||||
|
function formatNumber (num) {
|
||||||
|
return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,")
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatCurrency (num,decimal) {
|
||||||
|
var _decimal;
|
||||||
|
_decimal = typeof decimal !== "undefined" ? decimal : 2;
|
||||||
|
return parseFloat(num).toFixed(_decimal).replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,")
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue