gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue with js/dist dir

Browse Source 
Related to https://github.com/phpmyadmin/phpmyadmin/pull/16331.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2020-09-05 12:44:58 -03:00
parent fe8cac176e
commit 0a501353d4
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@ -1,3 +1,4 @@
js/vendor/
js/dist/
tmp/
vendor/

1
.scrutinizer.yml
View File

@ -6,6 +6,7 @@ filter:
excluded_paths:
- build/
- js/vendor/
- js/dist/
- node_modules/
- tmp/
- vendor/

3
js/src/ajax.js
View File

@ -769,7 +769,8 @@ var AJAX = {
var self = this;
script.type = 'text/javascript';
script.src = 'js/' + name + '?' + 'v=' + encodeURIComponent(CommonParams.get('PMA_VERSION'));
var file = name.indexOf('vendor/') !== -1 ? name : 'dist/' + name;
script.src = 'js/' + file + '?' + 'v=' + encodeURIComponent(CommonParams.get('PMA_VERSION'));
script.async = false;
script.onload = function () {
self.done(name, callback);

2
js/src/gis_data_editor.js
View File

@ -100,7 +100,7 @@ function loadJSAndGISEditor (value, field, type, inputName) {
var smallScripts = ['js/vendor/jquery/jquery.svg.js',
'js/vendor/jquery/jquery.mousewheel.js',
'js/vendor/jquery/jquery.event.drag-2.2.js',
'js/table/gis_visualization.js'];
'js/dist/table/gis_visualization.js'];
for (var i = 0; i < smallScripts.length; i++) {
script = document.createElement('script');

2
templates/scripts.twig
View File

@ -1,6 +1,6 @@
{% for file in files %}
<script data-cfasync="false" type="text/javascript" src="{{ base_dir }}js/
{{- file.filename starts with 'vendor/' ? file.filename : 'dist/' ~ file.filename -}}
{{- file.filename starts with 'vendor/' or file.filename starts with 'messages.php' ? file.filename : 'dist/' ~ file.filename -}}
{{- '.php' in file.filename ? get_common(file.params|merge({'v': version})) : '?v=' ~ version|url_encode }}"></script>
{% endfor %}

6
templates/setup/base.twig
View File

@ -8,9 +8,9 @@
<link href="styles.css" rel="stylesheet" type="text/css">
<script type="text/javascript" src="../js/vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../js/vendor/jquery/jquery-ui.min.js"></script>
<script type="text/javascript" src="../js/setup/ajax.js"></script>
<script type="text/javascript" src="../js/config.js"></script>
<script type="text/javascript" src="../js/setup/scripts.js"></script>
<script type="text/javascript" src="../js/dist/setup/ajax.js"></script>
<script type="text/javascript" src="../js/dist/config.js"></script>
<script type="text/javascript" src="../js/dist/setup/scripts.js"></script>
<script type="text/javascript" src="../js/messages.php"></script>
</head>
<body>