Merge pull request #13 from tafcoder/fix-gulp

Fix JS codes and update gulp
themefisher · Sep 10, 2018 · 23e3589 · 23e3589
2 parents 30416b5 + ba41e5a
commit 23e3589
Show file tree

Hide file tree

Showing 60 changed files with 314 additions and 5,979 deletions.
diff --git a/dist/css/sleek.css.map b/dist/css/sleek.css.map
diff --git a/dist/js/custom.js b/dist/js/custom.js
@@ -465,14 +465,14 @@ $(document).ready(function() {
   var dataTable1 = document.getElementById("d-table1");
   if (dataTable1 !== null) {
     $(dataTable1).DataTable({
-      ajax: "assets/js/datatable.json",
+      ajax: "assets/data/datatable.json",
       dom: 'T<"clear">lfrtip'
     });
   }
   var dataTable2 = document.getElementById("d-table2");
   if (dataTable2 !== null) {
     $(dataTable2).DataTable({
-      ajax: "assets/js/datatable.json",
+      ajax: "assets/data/datatable.json",
       dom: 'T<"clear">lfrtip',
       buttons: ["copy", "csv", "excel", "pdf", "print"]
     });

diff --git a/dist/js/custom.min.js b/dist/js/custom.min.js
diff --git a/dist/js/date-range.js b/dist/js/date-range.js
@@ -17,7 +17,7 @@ $(function() {
     var end = moment();
     var cb = function(start, end) {
       $("#sales-graph .date-range-report span").html(
-        start.format("MMMM D, YYYY") + " - " + end.format("MMMM D, YYYY")
+        start.format("ll") + " - " + end.format("ll")
       );
     };
 
@@ -55,7 +55,7 @@ $(function() {
     var end = moment();
     var cb = function(start, end) {
       $("#recent-orders .date-range-report span").html(
-        start.format("MMMM D, YYYY") + " - " + end.format("MMMM D, YYYY")
+        start.format("ll") + " - " + end.format("ll")
       );
     };
 
@@ -94,7 +94,7 @@ $(function() {
     var end = moment().subtract(1, "days");
     var cb = function(start, end) {
       $("#user-activity .date-range-report span").html(
-        start.format("MMMM D, YYYY") + " - " + end.format("MMMM D, YYYY")
+        start.format("ll") + " - " + end.format("ll")
       );
     };
 
@@ -133,7 +133,7 @@ $(function() {
     var end = moment();
     var cb = function(start, end) {
       $("#analytics-country .date-range-report span").html(
-        start.format("MMMM D, YYYY") + " - " + end.format("MMMM D, YYYY")
+        start.format("ll") + " - " + end.format("ll")
       );
     };
 
@@ -172,7 +172,7 @@ $(function() {
     var end = moment();
     var cb = function(start, end) {
       $("#page-views .date-range-report span").html(
-        start.format("MMMM D, YYYY") + " - " + end.format("MMMM D, YYYY")
+        start.format("ll") + " - " + end.format("ll")
       );
     };
 
@@ -210,7 +210,7 @@ $(function() {
     var end = moment();
     var cb = function(start, end) {
       $("#activity-user .date-range-report span").html(
-        start.format("MMMM D, YYYY") + " - " + end.format("MMMM D, YYYY")
+        start.format("ll") + " - " + end.format("ll")
       );
     };