Merging of the OpenEVSE web UI changes

openenergymonitor · May 23, 2017 · 23af147 · 23af147
1 parent bd50da6
commit 23af147
Show file tree

Hide file tree

Showing 11 changed files with 1,098 additions and 761 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,22 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+# The JSON files contain newlines inconsistently
+[*.json]
+insert_final_newline = ignore
+
+# Minified JavaScript files shouldn't be changed
+[**.min.js]
+indent_style = ignore
+insert_final_newline = ignore
+
+[*.md]
+trim_trailing_whitespace = false
+
diff --git a/lib/js/combine.sh b/lib/js/combine.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+LIB_DIR=$(dirname $(realpath $0))
+SRC_DIR=$LIB_DIR/../../src/data
+
+rm $SRC_DIR/lib.*
+
+C=0
+
+if [ 1 -eq $C ]; then
+  COMP="gzip -c"
+  OUT=.gz
+else
+  COMP="cat"
+  OUT=
+fi
+
+cat $LIB_DIR/jquery.slim.min.js \
+    $LIB_DIR/knockout.min.js \
+    $LIB_DIR/knockout.mapping.min.js \
+    | $COMP > $SRC_DIR/lib.js$OUT
diff --git a/lib/js/jquery.min.js b/lib/js/jquery.min.js
diff --git a/lib/js/jquery.slim.min.js b/lib/js/jquery.slim.min.js
diff --git a/lib/js/knockout.mapping.min.js b/lib/js/knockout.mapping.min.js