Skip to content

Commit

Permalink
Merge pull request #25 from xjlin0/devextreme_library_windows
Browse files Browse the repository at this point in the history
Devextreme library windows can load now without error, original javascript (dx.all.js) has many lines, many new lines may cause difference between Mac OS and windows
  • Loading branch information
xjlin0 authored Oct 16, 2021
2 parents 834d97d + 5ff9e3e commit 552d08d
Show file tree
Hide file tree
Showing 21 changed files with 27,357 additions and 73,054 deletions.
13 changes: 4 additions & 9 deletions attendees/templates/occasions/attendances_list_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,20 @@
{% block extra_css %}
<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.common.css"
href="{% static 'devextreme/dx.common.css' %}"
onload="this.rel='stylesheet'">

<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.light.compact.css"
href="{% static 'devextreme/dx.light.compact.css' %}"
onload="this.rel='stylesheet'">
{% endblock extra_css %}

{% block extra_head %}
<!-- <script defer-->
<!-- type="text/javascript"-->
<!-- src="{% static 'devextreme/dx.all.js' %}"-->
<!-- integrity="sha384-75bK4ZLEELlSEhSd8ULWOVWeCIoijhm7UqBORRx8R8emDvmmBq6sCWelRfb/sy1b sha512-4lb4h12Ql1C0JLhPnJWhEL2X6HrwrCP4XGJXorIxtV5xGUNfC6bmz/9A64bhERmYzi6UCU6d8yGKXIBQQ/iH9Q=="-->
<!-- crossorigin="anonymous">-->
<script defer
type="text/javascript"
src="https://cdn3.devexpress.com/jslib/21.1.6/js/dx.all.js"
integrity="sha384-75bK4ZLEELlSEhSd8ULWOVWeCIoijhm7UqBORRx8R8emDvmmBq6sCWelRfb/sy1b sha512-4lb4h12Ql1C0JLhPnJWhEL2X6HrwrCP4XGJXorIxtV5xGUNfC6bmz/9A64bhERmYzi6UCU6d8yGKXIBQQ/iH9Q=="
src="{% static 'devextreme/dx.all.min.js' %}"
integrity="sha256-3yi1QgXajjT5E8ZOUey5/GJwHdmtr3I3mQmYuKsid8g="
crossorigin="anonymous">
</script>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,10 @@
crossorigin="anonymous">
</script>

<!-- <script defer-->
<!-- type="text/javascript"-->
<!-- src="{% static 'devextreme/dx.all.js' %}"-->
<!-- integrity="sha384-cnNGdFpQw8wkyU1GB8McOr3QflVl8UeaRXUucUCnBL3FR61457ll67FTDYh/yQ5O sha512-7rH3hw5MKHmtN515LKVdNefqss0exGarCbF8fffYfioGwUZQ/yaTlHn+XNTAJ3fkIPsbzY+Wi9CKP1f/PVImhw=="-->
<!-- crossorigin="anonymous">-->
<script defer
type="text/javascript"
src="https://cdn3.devexpress.com/jslib/21.1.6/js/dx.all.js"
integrity="sha384-75bK4ZLEELlSEhSd8ULWOVWeCIoijhm7UqBORRx8R8emDvmmBq6sCWelRfb/sy1b sha512-4lb4h12Ql1C0JLhPnJWhEL2X6HrwrCP4XGJXorIxtV5xGUNfC6bmz/9A64bhERmYzi6UCU6d8yGKXIBQQ/iH9Q=="
src="{% static 'devextreme/dx.all.min.js' %}"
integrity="sha256-3yi1QgXajjT5E8ZOUey5/GJwHdmtr3I3mQmYuKsid8g="
crossorigin="anonymous">
</script>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@

<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.common.css"
href="{% static 'devextreme/dx.common.css' %}"
onload="this.rel='stylesheet'">

<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.light.compact.css"
href="{% static 'devextreme/dx.light.compact.css' %}"
onload="this.rel='stylesheet'">
{% endblock extra_css %}

Expand All @@ -45,15 +45,10 @@
crossorigin="anonymous">
</script>

<!-- <script defer-->
<!-- type="text/javascript"-->
<!-- src="{% static 'devextreme/dx.all.js' %}"-->
<!-- integrity="sha384-cnNGdFpQw8wkyU1GB8McOr3QflVl8UeaRXUucUCnBL3FR61457ll67FTDYh/yQ5O sha512-7rH3hw5MKHmtN515LKVdNefqss0exGarCbF8fffYfioGwUZQ/yaTlHn+XNTAJ3fkIPsbzY+Wi9CKP1f/PVImhw=="-->
<!-- crossorigin="anonymous">-->
<script defer
type="text/javascript"
src="https://cdn3.devexpress.com/jslib/21.1.6/js/dx.all.js"
integrity="sha384-75bK4ZLEELlSEhSd8ULWOVWeCIoijhm7UqBORRx8R8emDvmmBq6sCWelRfb/sy1b sha512-4lb4h12Ql1C0JLhPnJWhEL2X6HrwrCP4XGJXorIxtV5xGUNfC6bmz/9A64bhERmYzi6UCU6d8yGKXIBQQ/iH9Q=="
src="{% static 'devextreme/dx.all.min.js' %}"
integrity="sha256-3yi1QgXajjT5E8ZOUey5/GJwHdmtr3I3mQmYuKsid8g="
crossorigin="anonymous">
</script>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@

<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.common.css"
href="{% static 'devextreme/dx.common.css' %}"
onload="this.rel='stylesheet'">

<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.light.compact.css"
href="{% static 'devextreme/dx.light.compact.css' %}"
onload="this.rel='stylesheet'">
{% endblock extra_css %}

Expand All @@ -45,15 +45,10 @@
crossorigin="anonymous">
</script>

<!-- <script defer-->
<!-- type="text/javascript"-->
<!-- src="{% static 'devextreme/dx.all.js' %}"-->
<!-- integrity="sha384-cnNGdFpQw8wkyU1GB8McOr3QflVl8UeaRXUucUCnBL3FR61457ll67FTDYh/yQ5O sha512-7rH3hw5MKHmtN515LKVdNefqss0exGarCbF8fffYfioGwUZQ/yaTlHn+XNTAJ3fkIPsbzY+Wi9CKP1f/PVImhw=="-->
<!-- crossorigin="anonymous">-->
<script defer
type="text/javascript"
src="https://cdn3.devexpress.com/jslib/21.1.6/js/dx.all.js"
integrity="sha384-75bK4ZLEELlSEhSd8ULWOVWeCIoijhm7UqBORRx8R8emDvmmBq6sCWelRfb/sy1b sha512-4lb4h12Ql1C0JLhPnJWhEL2X6HrwrCP4XGJXorIxtV5xGUNfC6bmz/9A64bhERmYzi6UCU6d8yGKXIBQQ/iH9Q=="
src="{% static 'devextreme/dx.all.min.js' %}"
integrity="sha256-3yi1QgXajjT5E8ZOUey5/GJwHdmtr3I3mQmYuKsid8g="
crossorigin="anonymous">
</script>

Expand Down
13 changes: 4 additions & 9 deletions attendees/templates/occasions/gatherings_list_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,20 @@
{% block extra_css %}
<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.common.css"
href="{% static 'devextreme/dx.common.css' %}"
onload="this.rel='stylesheet'">

<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.light.compact.css"
href="{% static 'devextreme/dx.light.compact.css' %}"
onload="this.rel='stylesheet'">
{% endblock extra_css %}

{% block extra_head %}
<!-- <script defer-->
<!-- type="text/javascript"-->
<!-- src="{% static 'devextreme/dx.all.js' %}"-->
<!-- integrity="sha384-75bK4ZLEELlSEhSd8ULWOVWeCIoijhm7UqBORRx8R8emDvmmBq6sCWelRfb/sy1b sha512-4lb4h12Ql1C0JLhPnJWhEL2X6HrwrCP4XGJXorIxtV5xGUNfC6bmz/9A64bhERmYzi6UCU6d8yGKXIBQQ/iH9Q=="-->
<!-- crossorigin="anonymous">-->
<script defer
type="text/javascript"
src="https://cdn3.devexpress.com/jslib/21.1.6/js/dx.all.js"
integrity="sha384-75bK4ZLEELlSEhSd8ULWOVWeCIoijhm7UqBORRx8R8emDvmmBq6sCWelRfb/sy1b sha512-4lb4h12Ql1C0JLhPnJWhEL2X6HrwrCP4XGJXorIxtV5xGUNfC6bmz/9A64bhERmYzi6UCU6d8yGKXIBQQ/iH9Q=="
src="{% static 'devextreme/dx.all.min.js' %}"
integrity="sha256-3yi1QgXajjT5E8ZOUey5/GJwHdmtr3I3mQmYuKsid8g="
crossorigin="anonymous">
</script>

Expand Down
13 changes: 4 additions & 9 deletions attendees/templates/persons/attendee_update_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,20 @@
{% block extra_css %}
<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.common.css"
href="{% static 'devextreme/dx.common.css' %}"
onload="this.rel='stylesheet'">

<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.light.compact.css"
href="{% static 'devextreme/dx.light.compact.css' %}"
onload="this.rel='stylesheet'">
{% endblock extra_css %}

{% block extra_head %}
<!-- <script defer-->
<!-- type="text/javascript"-->
<!-- src="{% static 'devextreme/dx.all.js' %}"-->
<!-- integrity="sha384-cnNGdFpQw8wkyU1GB8McOr3QflVl8UeaRXUucUCnBL3FR61457ll67FTDYh/yQ5O sha512-7rH3hw5MKHmtN515LKVdNefqss0exGarCbF8fffYfioGwUZQ/yaTlHn+XNTAJ3fkIPsbzY+Wi9CKP1f/PVImhw=="-->
<!-- crossorigin="anonymous">-->
<script defer
type="text/javascript"
src="https://cdn3.devexpress.com/jslib/21.1.6/js/dx.all.js"
integrity="sha384-75bK4ZLEELlSEhSd8ULWOVWeCIoijhm7UqBORRx8R8emDvmmBq6sCWelRfb/sy1b sha512-4lb4h12Ql1C0JLhPnJWhEL2X6HrwrCP4XGJXorIxtV5xGUNfC6bmz/9A64bhERmYzi6UCU6d8yGKXIBQQ/iH9Q=="
src="{% static 'devextreme/dx.all.min.js' %}"
integrity="sha256-3yi1QgXajjT5E8ZOUey5/GJwHdmtr3I3mQmYuKsid8g="
crossorigin="anonymous">
</script>

Expand Down
13 changes: 4 additions & 9 deletions attendees/templates/persons/attendees_list_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,20 @@

<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.common.css"
href="{% static 'devextreme/dx.common.css' %}"
onload="this.rel='stylesheet'">

<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.light.compact.css"
href="{% static 'devextreme/dx.light.compact.css' %}"
onload="this.rel='stylesheet'">
{% endblock extra_css %}

{% block extra_head %}
<!-- <script defer-->
<!-- type="text/javascript"-->
<!-- src="{% static 'devextreme/dx.all.js' %}"-->
<!-- integrity="sha384-cnNGdFpQw8wkyU1GB8McOr3QflVl8UeaRXUucUCnBL3FR61457ll67FTDYh/yQ5O sha512-7rH3hw5MKHmtN515LKVdNefqss0exGarCbF8fffYfioGwUZQ/yaTlHn+XNTAJ3fkIPsbzY+Wi9CKP1f/PVImhw=="-->
<!-- crossorigin="anonymous">-->
<script defer
type="text/javascript"
src="https://cdn3.devexpress.com/jslib/21.1.6/js/dx.all.js"
integrity="sha384-75bK4ZLEELlSEhSd8ULWOVWeCIoijhm7UqBORRx8R8emDvmmBq6sCWelRfb/sy1b sha512-4lb4h12Ql1C0JLhPnJWhEL2X6HrwrCP4XGJXorIxtV5xGUNfC6bmz/9A64bhERmYzi6UCU6d8yGKXIBQQ/iH9Q=="
src="{% static 'devextreme/dx.all.min.js' %}"
integrity="sha256-3yi1QgXajjT5E8ZOUey5/GJwHdmtr3I3mQmYuKsid8g="
crossorigin="anonymous">
</script>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,20 @@

<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.common.css"
href="{% static 'devextreme/dx.common.css' %}"
onload="this.rel='stylesheet'">

<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.light.compact.css"
href="{% static 'devextreme/dx.light.compact.css' %}"
onload="this.rel='stylesheet'">
{% endblock extra_css %}

{% block extra_head %}
<!-- <script defer-->
<!-- type="text/javascript"-->
<!-- src="{% static 'devextreme/dx.all.js' %}"-->
<!-- integrity="sha384-cnNGdFpQw8wkyU1GB8McOr3QflVl8UeaRXUucUCnBL3FR61457ll67FTDYh/yQ5O sha512-7rH3hw5MKHmtN515LKVdNefqss0exGarCbF8fffYfioGwUZQ/yaTlHn+XNTAJ3fkIPsbzY+Wi9CKP1f/PVImhw=="-->
<!-- crossorigin="anonymous">-->
<script defer
type="text/javascript"
src="https://cdn3.devexpress.com/jslib/21.1.6/js/dx.all.js"
integrity="sha384-75bK4ZLEELlSEhSd8ULWOVWeCIoijhm7UqBORRx8R8emDvmmBq6sCWelRfb/sy1b sha512-4lb4h12Ql1C0JLhPnJWhEL2X6HrwrCP4XGJXorIxtV5xGUNfC6bmz/9A64bhERmYzi6UCU6d8yGKXIBQQ/iH9Q=="
src="{% static 'devextreme/dx.all.min.js' %}"
integrity="sha256-3yi1QgXajjT5E8ZOUey5/GJwHdmtr3I3mQmYuKsid8g="
crossorigin="anonymous">
</script>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,20 @@

<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.common.css"
href="{% static 'devextreme/dx.common.css' %}"
onload="this.rel='stylesheet'">

<link rel="preload"
as="style"
href="https://cdn3.devexpress.com/jslib/21.1.6/css/dx.light.compact.css"
href="{% static 'devextreme/dx.light.compact.css' %}"
onload="this.rel='stylesheet'">
{% endblock extra_css %}

{% block extra_head %}
<!-- <script defer-->
<!-- type="text/javascript"-->
<!-- src="{% static 'devextreme/dx.all.js' %}"-->
<!-- integrity="sha384-cnNGdFpQw8wkyU1GB8McOr3QflVl8UeaRXUucUCnBL3FR61457ll67FTDYh/yQ5O sha512-7rH3hw5MKHmtN515LKVdNefqss0exGarCbF8fffYfioGwUZQ/yaTlHn+XNTAJ3fkIPsbzY+Wi9CKP1f/PVImhw=="-->
<!-- crossorigin="anonymous">-->
<script defer
type="text/javascript"
src="https://cdn3.devexpress.com/jslib/21.1.6/js/dx.all.js"
integrity="sha384-75bK4ZLEELlSEhSd8ULWOVWeCIoijhm7UqBORRx8R8emDvmmBq6sCWelRfb/sy1b sha512-4lb4h12Ql1C0JLhPnJWhEL2X6HrwrCP4XGJXorIxtV5xGUNfC6bmz/9A64bhERmYzi6UCU6d8yGKXIBQQ/iH9Q=="
src="{% static 'devextreme/dx.all.min.js' %}"
integrity="sha256-3yi1QgXajjT5E8ZOUey5/GJwHdmtr3I3mQmYuKsid8g="
crossorigin="anonymous">
</script>

Expand Down
49 changes: 0 additions & 49 deletions libraries/devextreme/dx.all.js

This file was deleted.

1 change: 1 addition & 0 deletions libraries/devextreme/dx.all.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 552d08d

Please sign in to comment.