Merge pull request #2730 from AiyionPrime/minimized-js-naming

Minimized js naming

.editorconfig

@@ -15,10 +15,14 @@ indent_size = 4
 indent_style = unset
 indent_size = unset
 
+[*.css]
+
 [*.dia]
 indent_style = space
 indent_size = 2
 
+[*.js]
+
 [*{.json,.ecrc}]
 indent_style = space
 indent_size = 2

docs/_static/css/custom.css

@@ -1,8 +1,8 @@
 /*
-  This fixes the vertical position of list markers when the first
-  element in the <li> is a <pre> block
+	This fixes the vertical position of list markers when the first
+	element in the <li> is a <pre> block
 
-  Scrolling inside the <pre> block is still working as expected
+	Scrolling inside the <pre> block is still working as expected
 */
 .rst-content pre.literal-block,
 .rst-content div[class^='highlight'] pre {

package/gluon-status-page/Makefile

@@ -17,8 +17,10 @@ define Package/gluon-status-page/install
 	$(INSTALL_DIR) $(1)/lib/gluon/status-page/providers
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/stations $(1)/lib/gluon/status-page/providers/
 
-ifndef CONFIG_GLUON_MINIFY
-	$(CP) ./javascript/status-page.js $(1)/lib/gluon/status-page/www/static/status-page.js
+ifdef CONFIG_GLUON_MINIFY
+	$(INSTALL_DATA) ./javascript/status-page.min.js $(1)/lib/gluon/status-page/www/static/status-page.js
+else
+	$(INSTALL_DATA) ./javascript/status-page.js $(1)/lib/gluon/status-page/www/static/status-page.js
 endif
 
 	$(INSTALL_DIR) $(1)/lib/gluon/status-page/view/

package/gluon-status-page/javascript/status-page.js

@@ -1,7 +1,7 @@
 /*
 	Build using:
 
-	uglifyjs javascript/status-page.js -o files/lib/gluon/status-page/www/static/status-page.js -c -m
+	uglifyjs javascript/status-page.js -o javascript/status-page.min.js -c -m
 */
 
 'use strict';

package/gluon-web-model/Makefile

@@ -9,4 +9,17 @@ define Package/gluon-web-model
   DEPENDS:=+gluon-web
 endef
 
+PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY
+
+define Package/gluon-web-model/install
+	$(Gluon/Build/Install)
+	$(INSTALL_DIR) $(1)/lib/gluon/web/www/static/
+
+ifdef CONFIG_GLUON_MINIFY
+	$(INSTALL_DATA) ./javascript/gluon-web-model.min.js $(1)/lib/gluon/web/www/static/gluon-web-model.js
+else
+	$(INSTALL_DATA) ./javascript/gluon-web-model.js $(1)/lib/gluon/web/www/static/
+endif
+endef
+
 $(eval $(call BuildPackageGluon,gluon-web-model))

package/gluon-web-model/javascript/gluon-web-model.js

@@ -13,7 +13,7 @@
 /*
 	Build using:
 
-	uglifyjs javascript/gluon-web-model.js -o files/lib/gluon/web/www/static/gluon-web-model.js -c -m --support-ie8
+	uglifyjs javascript/gluon-web-model.js -o javascript/gluon-web-model.min.js -c -m --support-ie8
 */
 
 
@@ -56,9 +56,9 @@
 			var match;
 			if ((match = this.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/))) {
 				return (match[1] >= 0) && (match[1] <= 255) &&
-				       (match[2] >= 0) && (match[2] <= 255) &&
-				       (match[3] >= 0) && (match[3] <= 255) &&
-				       (match[4] >= 0) && (match[4] <= 255);
+					(match[2] >= 0) && (match[2] <= 255) &&
+					(match[3] >= 0) && (match[3] <= 255) &&
+					(match[4] >= 0) && (match[4] <= 255);
 			}
 
 			return false;

package/gluon-web-osm/Makefile

@@ -8,4 +8,17 @@ define Package/gluon-web-osm
   TITLE:=base src for OSM inlay
 endef
 
+PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY
+
+define Package/gluon-web-osm/install
+	$(Gluon/Build/Install)
+	$(INSTALL_DIR) $(1)/lib/gluon/web/www/static/
+
+ifdef CONFIG_GLUON_MINIFY
+	$(INSTALL_DATA) ./javascript/gluon-web-osm.min.js $(1)/lib/gluon/web/www/static/gluon-web-osm.js
+else
+	$(INSTALL_DATA) ./javascript/gluon-web-osm.js $(1)/lib/gluon/web/www/static/
+endif
+endef
+
 $(eval $(call BuildPackageGluon,gluon-web-osm))

package/gluon-web-osm/javascript/gluon-web-osm.js

@@ -1,7 +1,7 @@
 /*
 	Build using:
 
-	uglifyjs javascript/gluon-web-osm.js -o files/lib/gluon/web/www/static/gluon-web-osm.js -c -m
+	uglifyjs javascript/gluon-web-osm.js -o javascript/gluon-web-osm.min.js -c -m
 */
 
 'use strict';