Skip to content

Commit ac8ced6

Browse files
devpacdddevpacdd
committed
Merge remote-tracking branch 'refs/remotes/gitdedalo/v7_developer' into v7_developer
2 parents bf01878 + 58582f1 commit ac8ced6

186 files changed

Lines changed: 1030 additions & 1839 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎core/component_3d/js/render_search_component_3d.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@ render_search_component_3d.prototype.search = async function(options) {
6060
const get_content_data = function(self) {
6161

6262
// short vars
63-
const data = self.data || {}
64-
const value = data.value || []
63+
const data = self.data || {}
64+
const entries = data.entries || []
6565

6666
// content_data
6767
const content_data = ui.component.build_content_data(self)
6868

6969
// values (inputs)
70-
const inputs_value = value.length>0 ? value : ['']
71-
const value_length = inputs_value.length
72-
for (let i = 0; i < value_length; i++) {
70+
const inputs_value = entries.length>0 ? entries : ['']
71+
const entries_length = inputs_value.length
72+
for (let i = 0; i < entries_length; i++) {
7373
const input_element_node = get_content_value(i, inputs_value[i], self)
7474
content_data.appendChild(input_element_node)
7575
// set the pointer

‎core/component_3d/js/view_default_edit_3d.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,21 @@ const get_content_data_edit = function(self) {
7878
// await self.load_editor_files()
7979

8080
// short vars
81-
const data = self.data || {} // content generated by the server related to the involving data structure
82-
const value = data.value || [] // content generated by the server related to the file itself
81+
const data = self.data || {} // content generated by the server related to the involving data structure
82+
const entries = data.entries || [] // content generated by the server related to the file itself
8383

8484
// content_data
8585
const content_data = ui.component.build_content_data(self)
8686
// common media classes
8787
content_data.classList.add('media_content_data')
8888

8989
// values (inputs)
90-
const inputs_value = value || [] // force one empty input at least
91-
const value_length = inputs_value.length || 1
92-
if (value_length>1) {
93-
console.warn('More than one value in component_3d is not allowed at now. Ignored next values. N values: ', value_length);
90+
const inputs_value = entries || [] // force one empty input at least
91+
const entries_length = inputs_value.length || 1
92+
if (entries_length>1) {
93+
console.warn('More than one value in component_3d is not allowed at now. Ignored next values. N values: ', entries_length);
9494
}
95-
for (let i = 0; i < value_length; i++) {
95+
for (let i = 0; i < entries_length; i++) {
9696

9797
const content_value = (self.permissions===1)
9898
? get_content_value_read(i, inputs_value[i], self)
@@ -310,9 +310,9 @@ export const get_quality_selector = (content_value, self) => {
310310

311311
// short vars
312312
const data = self.data || {}
313-
const value = data.value || []
314-
const files_info = value[0] && value[0].files_info
315-
? value[0].files_info
313+
const entries = data.entries || []
314+
const files_info = entries[0] && entries[0].files_info
315+
? entries[0].files_info
316316
: []
317317
const quality = self.quality || self.context.features.quality
318318
const extension = self.context.features.extension

‎core/component_3d/js/view_default_list_3d.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ export const get_content_data = function(self) {
5858

5959
// short vars
6060
const data = self.data || {}
61-
const value = data.value || [] // value is a files_info list
62-
const files_info = value
61+
const entries = data.entries || [] // value is a files_info list
62+
const files_info = entries
6363
const quality = self.quality || self.context.features.quality
6464

6565
// content_data

‎core/component_3d/js/view_mini_list_3d.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ export const view_mini_list_3d = function() {
3030
view_mini_list_3d.render = async function(self, options) {
3131

3232
// short vars
33-
const data = self.data || {}
34-
const value = data.value || []
33+
const data = self.data || {}
34+
const entries = data.entries || []
3535

3636
// wrapper
3737
const wrapper = ui.component.build_wrapper_mini(self)
3838
wrapper.classList.add('media')
3939

4040
// files_info
41-
const files_info = value
41+
const files_info = entries
4242

4343
// thumb, if thumb doesn't exist get the posterframe then if the posterframe doesn't exist get the default image.
4444
const thumb = files_info.find(el => el.quality==='thumb' && el.file_exist===true)

‎core/component_3d/js/view_text_list_3d.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ export const view_text_list_3d = function() {
3030
view_text_list_3d.render = async function(self, options) {
3131

3232
// short vars
33-
const data = self.data || {}
34-
const value = data.value || []
33+
const data = self.data || {}
34+
const entries = data.entries || []
3535

3636
// files_info
37-
const files_info = value
37+
const files_info = entries
3838

3939
// thumb, if thumb doesn't exist get the posterframe then if the posterframe doesn't exist get the default image.
4040
const thumb = files_info.find(el => el.quality==='thumb' && el.file_exist===true)

‎core/component_av/js/render_search_component_av.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@ render_search_component_av.prototype.search = async function(options) {
6464
const get_content_data = function(self) {
6565

6666
// short vars
67-
const data = self.data || {}
68-
const value = data.value || []
67+
const data = self.data || {}
68+
const entries = data.entries || []
6969

7070
// content_data
7171
const content_data = ui.component.build_content_data(self)
7272

7373
// values (inputs)
74-
const inputs_value = value.length>0 ? value : ['']
75-
const value_length = inputs_value.length
76-
for (let i = 0; i < value_length; i++) {
74+
const inputs_value = entries.length>0 ? entries : ['']
75+
const entries_length = inputs_value.length
76+
for (let i = 0; i < entries_length; i++) {
7777
const input_element_node = get_content_value(i, inputs_value[i], self)
7878
content_data.appendChild(input_element_node)
7979
// set the pointer

‎core/component_av/js/view_default_edit_av.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,18 @@ view_default_edit_av.render = async function(self, options) {
7272
const get_content_data_edit = function(self) {
7373

7474
// short vars
75-
const data = self.data || {}
76-
const value = data.value || []
75+
const data = self.data || {}
76+
const entries = data.entries || []
7777

7878
// content_data
7979
const content_data = ui.component.build_content_data(self)
8080
// common media classes
8181
content_data.classList.add('media_content_data')
8282

8383
// values (inputs)
84-
const inputs_value = (value.length>0) ? value : [null] // force one empty input at least
85-
const value_length = inputs_value.length
86-
for (let i = 0; i < value_length; i++) {
84+
const inputs_value = (entries.length>0) ? entries : [null] // force one empty input at least
85+
const entries_length = inputs_value.length
86+
for (let i = 0; i < entries_length; i++) {
8787
// force use new separate task
8888
dd_request_idle_callback(
8989
() => {
@@ -312,9 +312,9 @@ const get_quality_selector = (content_value, self) => {
312312

313313
// short vars
314314
const data = self.data || {}
315-
const value = data.value || []
316-
const files_info = value[0] && value[0].files_info
317-
? value[0].files_info
315+
const entries = data.entries || []
316+
const files_info = entries[0] && entries[0].files_info
317+
? entries[0].files_info
318318
: []
319319
const quality = self.quality || self.context?.features?.quality
320320
const extension = self.context?.features?.extension

‎core/component_av/js/view_default_list_av.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ const get_content_data = function(self) {
6363

6464
// short vars
6565
const data = self.data || {}
66-
const value = data.value || [] // value is a files_info list
67-
const files_info = value
66+
const entries = data.entries || [] // value is a files_info list
67+
const files_info = entries
6868

6969
// content_data
7070
const content_data = ui.create_dom_element({

‎core/component_av/js/view_mini_list_av.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ export const view_mini_list_av = function() {
2929
view_mini_list_av.render = async function(self) {
3030

3131
// short vars
32-
const data = self.data || {}
33-
const value = data.value || []
32+
const data = self.data || {}
33+
const entries = data.entries || []
3434

3535
// wrapper
3636
const wrapper = ui.component.build_wrapper_mini(self)
3737

3838
// files_info
39-
const files_info = value
39+
const files_info = entries
4040

4141
// thumb
4242
const thumb = files_info.find(el => el.quality==='thumb' && el.file_exist===true)

‎core/component_av/js/view_player_edit_av.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ export const get_content_data_player = function(options) {
7979
// short vars
8080
const context = self.context || {}
8181
const data = self.data || {}
82-
const value = data.value || []
83-
const files_info = value[0]
84-
? (value[0].files_info || [])
82+
const entries = data.entries || []
83+
const files_info = entries[0]
84+
? (entries[0].files_info || [])
8585
: []
8686
const quality = self.quality || context.features.quality
8787
const extension = self.context.features.extension

0 commit comments

Comments
 (0)