CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update core edit.*.js

Browse Source 
- all function let are converted to var
- add return to acssel, racssel calls
This commit is contained in:
Clemens Schwaighofer
2019-05-31 18:29:13 +09:00
parent fe32dd4543
commit 1b45a1b770
2 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
www/layout/admin/javascript/edit.jq.js
View File

@@ -217,7 +217,7 @@ if (!String.prototype.unescapeHTML) {
// DESC : returns current timestamp (unix timestamp) // DESC : returns current timestamp (unix timestamp)
function getTimestamp() function getTimestamp()
{ {
let date = new Date(); var date = new Date();
return date.getTime(); return date.getTime();
} }
@@ -441,10 +441,11 @@ const rel = (base) => {
// DESC : searches and removes style from css array // DESC : searches and removes style from css array
function rcssel(_element, css) function rcssel(_element, css)
{ {
let css_index = _element.css.indexOf(css); var css_index = _element.css.indexOf(css);
if (css_index > -1) { if (css_index > -1) {
_element.css.splice(css_index, 1); _element.css.splice(css_index, 1);
} }
return _element;
} }
// METHOD: acssel [add css element] // METHOD: acssel [add css element]
@@ -453,10 +454,11 @@ function rcssel(_element, css)
// DESC : adds a new style sheet to the element given // DESC : adds a new style sheet to the element given
function acssel(_element, css) function acssel(_element, css)
{ {
let css_index = _element.css.indexOf(css); var css_index = _element.css.indexOf(css);
if (css_index == -1) { if (css_index == -1) {
_element.css.push(css); _element.css.push(css);
} }
return _element;
} }
// METHOD: scssel // METHOD: scssel
@@ -479,10 +481,10 @@ function scssel(_element, rcss, acss)
function phfo(tree) function phfo(tree)
{ {
// holds the elements // holds the elements
let content = []; var content = [];
// main part line // main part line
let line = '<' + tree.tag; var line = '<' + tree.tag;
let i; var i;
// first id, if set // first id, if set
if (tree.id) { if (tree.id) {
line += ' id="' + tree.id + '"'; line += ' id="' + tree.id + '"';
@@ -547,10 +549,12 @@ function phfo(tree)
// the array needs to be key -> value format. key is for the option id and value is for the data output // the array needs to be key -> value format. key is for the option id and value is for the data output
function html_options(name, data, selected = '', options_only = false, return_string = false, sort = '') function html_options(name, data, selected = '', options_only = false, return_string = false, sort = '')
{ {
let content = []; var content = [];
let element_select; var element_select;
let element_option; var element_option;
let data_list = []; // for sorted output var data_list = []; // for sorted output
var value;
var options;
// set outside select, gets stripped on return if options only is true // set outside select, gets stripped on return if options only is true
element_select = cel('select', name); element_select = cel('select', name);
// console.log('Call for %s, options: %s', name, options_only); // console.log('Call for %s, options: %s', name, options_only);
@@ -565,10 +569,10 @@ function html_options(name, data, selected = '', options_only = false, return_st
// use the previously sorted list // use the previously sorted list
// for (const [key, value] of Object.entries(data)) { // for (const [key, value] of Object.entries(data)) {
for (const key of data_list) { for (const key of data_list) {
let value = data[key]; value = data[key];
console.log('create [%s] options: key: %s, value: %s', name, key, value); console.log('create [%s] options: key: %s, value: %s', name, key, value);
// basic options init // basic options init
let options = { options = {
'label': value, 'label': value,
'value': key 'value': key
}; };
@@ -609,9 +613,10 @@ function html_options(name, data, selected = '', options_only = false, return_st
// DESC : refills a select box with options and keeps the selected // DESC : refills a select box with options and keeps the selected
function html_options_refill(name, data, sort = '') function html_options_refill(name, data, sort = '')
{ {
let element_option; var element_option;
let option_selected; var option_selected;
let data_list = []; // for sorted output var data_list = []; // for sorted output
var value;
// skip if not exists // skip if not exists
if (document.getElementById(name)) { if (document.getElementById(name)) {
// console.log('Call for %s, options: %s', name, options_only); // console.log('Call for %s, options: %s', name, options_only);
@@ -628,7 +633,7 @@ function html_options_refill(name, data, sort = '')
}); });
document.getElementById(name).innerHTML = ''; document.getElementById(name).innerHTML = '';
for (const key of data_list) { for (const key of data_list) {
let value = data[key]; value = data[key];
// console.log('add [%s] options: key: %s, value: %s', name, key, value); // console.log('add [%s] options: key: %s, value: %s', name, key, value);
element_option = document.createElement('option'); element_option = document.createElement('option');
element_option.label = value; element_option.label = value;

44
www/layout/admin/javascript/edit.pt.js
View File

@@ -295,7 +295,7 @@ if (!String.prototype.unescapeHTML) {
// DESC : returns current timestamp (unix timestamp) // DESC : returns current timestamp (unix timestamp)
function getTimestamp() function getTimestamp()
{ {
let date = new Date(); var date = new Date();
return date.getTime(); return date.getTime();
} }
@@ -506,7 +506,7 @@ function aelx(base, ...attach)
// METHOD: rel [reset element] // METHOD: rel [reset element]
// PARAMS: cel created element // PARAMS: cel created element
// RETURN: returns sub reset base element // RETURN: returns reset base element
// DESC : resets the sub elements of the base element given // DESC : resets the sub elements of the base element given
const rel = (base) => { const rel = (base) => {
base.sub = []; base.sub = [];
@@ -515,37 +515,40 @@ const rel = (base) => {
// METHOD: rcssel [remove a css from the element] // METHOD: rcssel [remove a css from the element]
// PARAMS: element, style sheet to remove // PARAMS: element, style sheet to remove
// RETURN: "none", in place because of reference // RETURN: returns full element
// DESC : searches and removes style from css array // DESC : searches and removes style from css array
function rcssel(_element, css) function rcssel(_element, css)
{ {
let css_index = _element.css.indexOf(css); var css_index = _element.css.indexOf(css);
if (css_index > -1) { if (css_index > -1) {
_element.css.splice(css_index, 1); _element.css.splice(css_index, 1);
} }
return _element;
} }
// METHOD: acssel [add css element] // METHOD: acssel [add css element]
// PARAMS: element, style sheet to add // PARAMS: element, style sheet to add
// RETURN: "none", in place add because of reference // RETURN: returns full element
// DESC : adds a new style sheet to the element given // DESC : adds a new style sheet to the element given
function acssel(_element, css) function acssel(_element, css)
{ {
let css_index = _element.css.indexOf(css); var css_index = _element.css.indexOf(css);
if (css_index == -1) { if (css_index == -1) {
_element.css.push(css); _element.css.push(css);
} }
return _element;
} }
// METHOD: scssel // METHOD: scssel
// PARAMS: element, style to remove, style to add // PARAMS: element, style to remove, style to add
// RETURN: "none", in place add because of reference // RETURN: returns full element
// DESC : removes one css and adds another // DESC : removes one css and adds another
// is a wrapper around rcssel/acssel // is a wrapper around rcssel/acssel
function scssel(_element, rcss, acss) function scssel(_element, rcss, acss)
{ {
rcssel(_element, rcss); rcssel(_element, rcss);
acssel(_element, acss); acssel(_element, acss);
return _element;
} }
// METHOD: phfo [produce html from object] // METHOD: phfo [produce html from object]
@@ -557,9 +560,9 @@ function scssel(_element, rcss, acss)
function phfo(tree) function phfo(tree)
{ {
// holds the elements // holds the elements
let content = []; var content = [];
// main part line // main part line
let line = '<' + tree.tag; var line = '<' + tree.tag;
// first id, if set // first id, if set
if (tree.id) { if (tree.id) {
line += ' id="' + tree.id + '"'; line += ' id="' + tree.id + '"';
@@ -624,10 +627,12 @@ function phfo(tree)
// the array needs to be key -> value format. key is for the option id and value is for the data output // the array needs to be key -> value format. key is for the option id and value is for the data output
function html_options(name, data, selected = '', options_only = false, return_string = false, sort = '') function html_options(name, data, selected = '', options_only = false, return_string = false, sort = '')
{ {
let content = []; var content = [];
let element_select; var element_select;
let element_option; var element_option;
let data_list = []; // for sorted output var data_list = []; // for sorted output
var value;
var options;
// set outside select, gets stripped on return if options only is true // set outside select, gets stripped on return if options only is true
element_select = cel('select', name); element_select = cel('select', name);
// console.log('Call for %s, options: %s', name, options_only); // console.log('Call for %s, options: %s', name, options_only);
@@ -642,10 +647,10 @@ function html_options(name, data, selected = '', options_only = false, return_st
// use the previously sorted list // use the previously sorted list
// for (const [key, value] of Object.entries(data)) { // for (const [key, value] of Object.entries(data)) {
for (const key of data_list) { for (const key of data_list) {
let value = data[key]; value = data[key];
console.log('create [%s] options: key: %s, value: %s', name, key, value); console.log('create [%s] options: key: %s, value: %s', name, key, value);
// basic options init // basic options init
let options = { options = {
'label': value, 'label': value,
'value': key 'value': key
}; };
@@ -686,9 +691,10 @@ function html_options(name, data, selected = '', options_only = false, return_st
// DESC : refills a select box with options and keeps the selected // DESC : refills a select box with options and keeps the selected
function html_options_refill(name, data, sort = '') function html_options_refill(name, data, sort = '')
{ {
let element_option; var element_option;
let option_selected; var option_selected;
let data_list = []; // for sorted output var data_list = []; // for sorted output
var value;
// skip if not exists // skip if not exists
if ($(name)) { if ($(name)) {
// console.log('Call for %s, options: %s', name, options_only); // console.log('Call for %s, options: %s', name, options_only);
@@ -705,7 +711,7 @@ function html_options_refill(name, data, sort = '')
}); });
$(name).innerHTML = ''; $(name).innerHTML = '';
for (const key of data_list) { for (const key of data_list) {
let value = data[key]; value = data[key];
// console.log('add [%s] options: key: %s, value: %s', name, key, value); // console.log('add [%s] options: key: %s, value: %s', name, key, value);
element_option = document.createElement('option'); element_option = document.createElement('option');
element_option.label = value; element_option.label = value;