Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit ff41db5

Browse files
committed
remove var usage
1 parent 3088f69 commit ff41db5

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎Ajax/common/traits/JsUtilsAjaxTrait.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected function _ajax($method, $url, $responseElement = '', $parameters = [])
3333
$retour = $this->_getAjaxUrl($url, $attr);
3434
$originalSelector = $responseElement;
3535
$responseElement = $this->_getResponseElement($responseElement);
36-
$retour .= "var self=this;\n";
36+
$retour .= "let self=this;\n";
3737
$before = isset($before) ? $before : "";
3838
$retour .= $before;
3939
if ($hasLoader === true && JString::isNotNull($responseElement)) {
@@ -66,10 +66,10 @@ protected function _ajax($method, $url, $responseElement = '', $parameters = [])
6666
}
6767
if (isset($partial)) {
6868
$ajaxParameters["xhr"] = "xhrProvider";
69-
$retour .= "var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
69+
$retour .= "let xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
7070
} elseif (isset($upload)) {
7171
$ajaxParameters["xhr"] = "xhrProvider";
72-
$retour .= 'var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.upload.addEventListener("progress", function(event) {if (event.lengthComputable) {' . $upload . '}}, false);';
72+
$retour .= 'let xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.upload.addEventListener("progress", function(event) {if (event.lengthComputable) {' . $upload . '}}, false);';
7373
}
7474
$this->createAjaxParameters($ajaxParameters, $parameters);
7575
$retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data, textStatus, jqXHR ) {\n";
@@ -125,7 +125,7 @@ protected function _addJsCondition($jsCondition, $jsSource) {
125125

126126
protected function _getAjaxUrl($url, $attr) {
127127
$url = $this->_correctAjaxUrl($url);
128-
$retour = "url='" . $url . "';";
128+
$retour = "let url='" . $url . "';";
129129
$slash = "/";
130130
if (JString::endswith($url, "/") === true) {
131131
$slash = "";
@@ -147,12 +147,12 @@ protected function _getAjaxUrl($url, $attr) {
147147
}
148148

149149
protected function onPopstate() {
150-
return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};";
150+
return "window.onpopstate = function(e){if(e.state){let target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};";
151151
}
152152

153153
protected function autoActiveLinks($previousURL = "window.location.href") {
154-
$result = "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
155-
$result .= "\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
154+
$result = "\nif (typeof getHref !== 'function'){function getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}}";
155+
$result .= "\nlet myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
156156
return $result;
157157
}
158158

@@ -460,10 +460,10 @@ private function _jsonArray($maskSelector, $url, $method = 'get', $parameters =
460460
}
461461
$appendTo = "\t\tnewElm.appendTo(" . $parent . ");\n";
462462
$retour = $parent . ".find('.{$rowClass}').remove();";
463-
$retour .= "\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.each(data, function(index, value) {\n" . "\tvar created=false;var maskElm=$('" . $maskSelector . "').first();maskElm.hide();" . "\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;" . "\tvar newElm=" . $newElm . ";\n" . "\tif(!newElm.length){\n" . "\t\tnewElm=maskElm.clone();
464-
newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
463+
$retour .= "\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.each(data, function(index, value) {\n" . "\tlet created=false;let maskElm=$('" . $maskSelector . "').first();maskElm.hide();" . "\tlet newId=(maskElm.attr('id') || 'mask')+'-'+index;" . "\tlet newElm=" . $newElm . ";\n" . "\tif(!newElm.length){\n" . "\t\tnewElm=maskElm.clone();
464+
newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ let newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
465465
$retour .= $appendTo;
466-
$retour .= "\t}\n" . "\tfor(var key in value){\n" . "\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n" . "\t\t\tif(html.indexOf('__'+key+'__')>-1){\n" . "\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n" . "\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n" . "\t\t\t}\n" . "\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n" . "\t\t\tvar selElm=$(sel,newElm);\n" . "\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n" . "\t\t}\n" . "}\n" . "\t$(newElm).show(true);" . "\n" . "\t$(newElm).removeClass('hide');" . "});\n";
466+
$retour .= "\t}\n" . "\tfor(var key in value){\n" . "\t\t\tlet html = $('<div />').append($(newElm).clone()).html();\n" . "\t\t\tif(html.indexOf('__'+key+'__')>-1){\n" . "\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n" . "\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n" . "\t\t\t}\n" . "\t\tlet sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n" . "\t\t\tlet selElm=$(sel,newElm);\n" . "\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n" . "\t\t}\n" . "}\n" . "\t$(newElm).show(true);" . "\n" . "\t$(newElm).removeClass('hide');" . "});\n";
467467
$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
468468
$retour .= "\t" . $jsCallback;
469469
$parameters["jsCallback"] = $retour;
@@ -641,7 +641,7 @@ public function getHref($element, $responseElement = "", $parameters = array())
641641
$parameters['historize'] = true;
642642
}
643643
if (! isset($parameters['jsCallback'])) {
644-
$parameters['jsCallback'] = 'var event = jQuery.Event( "getHref" );event.url = url;$(self).trigger(event);';
644+
$parameters['jsCallback'] = 'let event = jQuery.Event( "getHref" );event.url = url;$(self).trigger(event);';
645645
}
646646
return $this->getOnClick($element, "", $responseElement, $parameters);
647647
}
@@ -697,7 +697,7 @@ public function postFormAction($element, $responseElement = "", $parameters = ar
697697
$parameters['hasLoader'] = '$(self).find("button, input[type=submit], input[type=button]")';
698698
}
699699
if (! isset($parameters['jsCallback'])) {
700-
$parameters['jsCallback'] = 'var event = jQuery.Event( "postFormAction" );event.params = Object.fromEntries(new URLSearchParams(params));$(self).trigger(event);';
700+
$parameters['jsCallback'] = 'let event = jQuery.Event( "postFormAction" );event.params = Object.fromEntries(new URLSearchParams(params));$(self).trigger(event);';
701701
}
702702
return $this->postFormOn('submit', $element, '', $formId, $responseElement, $parameters);
703703
}
@@ -794,15 +794,15 @@ private function _postForm($url, $form, $responseElement, $parameters = []) {
794794
$form = $this->_getFormElement($form);
795795
$retour .= "\n$('#'+" . $form . ").trigger('ajaxSubmit');";
796796
if (! isset($contentType) || $contentType != 'false') {
797-
$retour .= "\nvar params=$('#'+" . $form . ").serialize();\n";
797+
$retour .= "\nlet params=$('#'+" . $form . ").serialize();\n";
798798
if (isset($params)) {
799799
$retour .= "params+='&'+" . self::_correctParams($params) . ";\n";
800800
}
801801
} else {
802-
$retour .= "\nvar params=new FormData($('#'+" . $form . ")[0]);\n";
802+
$retour .= "\nlet params=new FormData($('#'+" . $form . ")[0]);\n";
803803
}
804804
$responseElement = $this->_getResponseElement($responseElement);
805-
$retour .= "var self=this;\n";
805+
$retour .= "let self=this;\n";
806806
$before = isset($before) ? $before : "";
807807
$retour .= $before;
808808
if ($hasLoader === true) {
@@ -827,7 +827,7 @@ private function _postForm($url, $form, $responseElement, $parameters = []) {
827827
}
828828
if (isset($partial)) {
829829
$ajaxParameters["xhr"] = "xhrProvider";
830-
$retour .= "var xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
830+
$retour .= "let xhr = $.ajaxSettings.xhr();function xhrProvider() {return xhr;};xhr.onreadystatechange = function (e) { if (3==e.target.readyState){let response=e.target.responseText;" . $partial . ";}; };";
831831
}
832832
$this->createAjaxParameters($ajaxParameters, $parameters);
833833
$retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data ) {\n";

‎Ajax/common/traits/JsUtilsInternalTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ protected function _compileLibrary(BaseGui $library, &$view = NULL) {
2727
}
2828

2929
protected function defer($script) {
30-
$result = "window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { window.defer(method); }, 50);};";
31-
$result .= "window.defer(function(){" . $script . "});";
30+
$result = "(function(){window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { window.defer(method); }, 50);};";
31+
$result .= "window.defer(function(){" . $script . "})})()";
3232
return $result;
3333
}
3434

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /