nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Minimized js naming
This commit is contained in:
Matthias Schiffer 2023-01-04 12:05:19 +01:00 committed by GitHub
commit 34ba8b3047
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.editorconfig
View File

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

6
docs/_static/css/custom.css vendored
View File

@ -1,8 +1,8 @@
/* /*
This fixes the vertical position of list markers when the first This fixes the vertical position of list markers when the first
element in the <li> is a <pre> block 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 pre.literal-block,
.rst-content div[class^='highlight'] pre { .rst-content div[class^='highlight'] pre {

6
package/gluon-status-page/Makefile
View File

@ -17,8 +17,10 @@ define Package/gluon-status-page/install
$(INSTALL_DIR) $(1)/lib/gluon/status-page/providers $(INSTALL_DIR) $(1)/lib/gluon/status-page/providers
$(INSTALL_BIN) $(PKG_BUILD_DIR)/stations $(1)/lib/gluon/status-page/providers/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations $(1)/lib/gluon/status-page/providers/
ifndef CONFIG_GLUON_MINIFY ifdef CONFIG_GLUON_MINIFY
$(CP) ./javascript/status-page.js $(1)/lib/gluon/status-page/www/static/status-page.js $(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 endif
$(INSTALL_DIR) $(1)/lib/gluon/status-page/view/ $(INSTALL_DIR) $(1)/lib/gluon/status-page/view/

2
package/gluon-status-page/javascript/status-page.js
View File

@ -1,7 +1,7 @@
/* /*
Build using: 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'; 'use strict';

0
package/gluon-status-page/files/lib/gluon/status-page/www/static/status-page.js → package/gluon-status-page/javascript/status-page.min.js vendored
View File

13
package/gluon-web-model/Makefile
View File

@ -9,4 +9,17 @@ define Package/gluon-web-model
DEPENDS:=+gluon-web DEPENDS:=+gluon-web
endef 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)) $(eval $(call BuildPackageGluon,gluon-web-model))

8
package/gluon-web-model/javascript/gluon-web-model.js
View File

@ -13,7 +13,7 @@
/* /*
Build using: 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; var match;
if ((match = this.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/))) { if ((match = this.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/))) {
return (match[1] >= 0) && (match[1] <= 255) && return (match[1] >= 0) && (match[1] <= 255) &&
(match[2] >= 0) && (match[2] <= 255) && (match[2] >= 0) && (match[2] <= 255) &&
(match[3] >= 0) && (match[3] <= 255) && (match[3] >= 0) && (match[3] <= 255) &&
(match[4] >= 0) && (match[4] <= 255); (match[4] >= 0) && (match[4] <= 255);
} }
return false; return false;

0
package/gluon-web-model/files/lib/gluon/web/www/static/gluon-web-model.js → package/gluon-web-model/javascript/gluon-web-model.min.js vendored
View File

13
package/gluon-web-osm/Makefile
View File

@ -8,4 +8,17 @@ define Package/gluon-web-osm
TITLE:=base src for OSM inlay TITLE:=base src for OSM inlay
endef 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)) $(eval $(call BuildPackageGluon,gluon-web-osm))

2
package/gluon-web-osm/javascript/gluon-web-osm.js
View File

@ -1,7 +1,7 @@
/* /*
Build using: 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'; 'use strict';

0
package/gluon-web-osm/files/lib/gluon/web/www/static/gluon-web-osm.js → package/gluon-web-osm/javascript/gluon-web-osm.min.js vendored
View File