joomla/Component-Builder
39
25
Fork 11
Code Issues 75 Pull Requests Projects 4 Wiki Activity

Fixed line break error in JavaScript building area, also added little notice in field area to select field type.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2018-04-11 22:48:37 +02:00
parent e6b2b48ac7
commit 802554e7a9
16 changed files with 166 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
admin/models/field.php
View File

@ -112,10 +112,10 @@ class ComponentbuilderModelField extends JModelAdmin
$item->css_views = base64_decode($item->css_views);
}
if (!empty($item->javascript_views_footer))
if (!empty($item->css_view))
{
// base64 Decode javascript_views_footer.
$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
// base64 Decode css_view.
$item->css_view = base64_decode($item->css_view);
}
if (!empty($item->javascript_view_footer))
@ -124,10 +124,10 @@ class ComponentbuilderModelField extends JModelAdmin
$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
}
if (!empty($item->css_view))
if (!empty($item->javascript_views_footer))
{
// base64 Decode css_view.
$item->css_view = base64_decode($item->css_view);
// base64 Decode javascript_views_footer.
$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
}
@ -937,10 +937,10 @@ class ComponentbuilderModelField extends JModelAdmin
$data['css_views'] = base64_encode($data['css_views']);
}
// Set the javascript_views_footer string to base64 string.
if (isset($data['javascript_views_footer']))
// Set the css_view string to base64 string.
if (isset($data['css_view']))
{
$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
$data['css_view'] = base64_encode($data['css_view']);
}
// Set the javascript_view_footer string to base64 string.
@ -949,10 +949,10 @@ class ComponentbuilderModelField extends JModelAdmin
$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
}
// Set the css_view string to base64 string.
if (isset($data['css_view']))
// Set the javascript_views_footer string to base64 string.
if (isset($data['javascript_views_footer']))
{
$data['css_view'] = base64_encode($data['css_view']);
$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
}
// Set the Params Items to data