layouts/v7/modules/Vtiger/ComposeEmailForm.tpl

@@ -145,7 +145,7 @@
                                                 {assign var=FILE_TYPE value="file"}
                                             {/if}
                                             <div class="MultiFile-label customAttachment" data-file-id="{(isset($ATTACHMENT['fileid'])) ? $ATTACHMENT['fileid'] : ''}" data-file-type="{$FILE_TYPE}"  data-file-size="{$ATTACHMENT['size']}" {if $FILE_TYPE eq "document"} data-document-id="{$DOCUMENT_ID}"{/if}>
-                                                {if $ATTACHMENT['nondeletable'] neq true}
+                                                {if isset($ATTACHMENT['nondeletable']) && $ATTACHMENT['nondeletable'] neq true}
                                                     <a name="removeAttachment" class="cursorPointer">x </a>
                                                 {/if}
                                                 <span>{$ATTACHMENT['attachment']}</span>
@@ -175,14 +175,14 @@
                     </div>         
                     <div class="row templateContent">
                         <div class="col-lg-12">
-                            <textarea style="width:390px;height:200px;" id="description" name="description">{if !empty($DESCRIPTION)}{$DESCRIPTION|escape:html}{/if}</textarea>
+                            <textarea style="width:390px;height:200px;" id="description" name="description">{if !empty($DESCRIPTION)}{$DESCRIPTION}{/if}</textarea>
                         </div>
                     </div>
                     
                     {if isset($RELATED_LOAD) && $RELATED_LOAD eq true}
                         <input type="hidden" name="related_load" value={$RELATED_LOAD} />
                     {/if}
-                    <input type="hidden" name="attachments" value="{if isset($ATTACHMENTS)}{ZEND_JSON::encode($ATTACHMENTS)}{/if}" />
+                    <input type="hidden" name="attachments" value="{if isset($ATTACHMENTS)}{ZEND_JSON::encode($ATTACHMENTS)}{else}null{/if}" />
                     <div id="emailTemplateWarningContent" style="display: none;">
                         {vtranslate('LBL_EMAILTEMPLATE_WARNING_CONTENT',$MODULE)}
                     </div>

layouts/v7/modules/Vtiger/DetailViewBlockView.tpl

@@ -55,7 +55,7 @@
 											<span class='muted'>{vtranslate($tax.taxlabel, $MODULE)}(%)</span>
 										</td>
 										<td class="fieldValue {$WIDTHTYPE}">
-											<span class="value textOverflowEllipsis" data-field-type="{$FIELD_MODEL->getFieldDataType()}" >
+											<span class="value textOverflowEllipsis" data-field-type="{$fieldDataType}" >
 												{if $tax.check_value eq 1}
 													{$tax.percentage}
 												{else}
@@ -115,7 +115,7 @@
 											{assign var=FIELD_DISPLAY_VALUE value=Vtiger_Util_Helper::toSafeHTML($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue')))}
 										{/if}
 
-										<span class="value" data-field-type="{$FIELD_MODEL->getFieldDataType()}" {if $FIELD_MODEL->get('uitype') eq '19' or $FIELD_MODEL->get('uitype') eq '21'} style="white-space:normal;" {/if}>
+										<span class="value" data-field-type="{$fieldDataType}" {if $FIELD_MODEL->get('uitype') eq '19' or $FIELD_MODEL->get('uitype') eq '21'} style="white-space:normal;" {/if}>
 											{include file=vtemplate_path($FIELD_MODEL->getUITypeModel()->getDetailViewTemplateName(),$MODULE_NAME) FIELD_MODEL=$FIELD_MODEL USER_MODEL=$USER_MODEL MODULE=$MODULE_NAME RECORD=$RECORD}
 										</span>
 										{if isset($IS_AJAX_ENABLED) && $IS_AJAX_ENABLED && $FIELD_MODEL->isEditable() eq 'true' && $FIELD_MODEL->isAjaxEditable() eq 'true'}

layouts/v7/modules/Vtiger/ListViewActions.tpl

@@ -27,13 +27,13 @@
         <div class = "row">
             <div class=" col-md-3">
             <div class="btn-group listViewActionsContainer" role="group" aria-label="...">
-                {if $editAction}
+                {if isset($editAction) && $editAction}
                     <button type="button" class="btn btn-default" id={$MODULE}_listView_massAction_{$editAction->getLabel()} 
                             {if stripos($editAction->getUrl(), 'javascript:')===0} href="javascript:void(0);" onclick='{$editAction->getUrl()|substr:strlen("javascript:")}'{else} href='{$editAction->getUrl()}' {/if} title="{vtranslate('LBL_EDIT', $MODULE)}" disabled="disabled">
                         <i class="fa fa-pencil"></i>
                     </button>
                 {/if}
-                {if $deleteAction}
+                {if isset($deleteAction) && $deleteAction}
                     <button type="button" class="btn btn-default" id={$MODULE}_listView_massAction_{$deleteAction->getLabel()} 
                             {if stripos($deleteAction->getUrl(), 'javascript:')===0} href="javascript:void(0);" onclick='{$deleteAction->getUrl()|substr:strlen("javascript:")}'{else} href='{$deleteAction->getUrl()}' {/if} title="{vtranslate('LBL_DELETE', $MODULE)}" disabled="disabled">
                         <i class="fa fa-trash"></i>
@@ -98,7 +98,7 @@
                             {if $PRINT_TEMPLATE}
                                 <li class="hide"><a id="{$MODULE}_listView_advancedAction_{Vtiger_Util_Helper::replaceSpaceWithUnderScores($PRINT_TEMPLATE->getLabel())}" {if stripos($PRINT_TEMPLATE->getUrl(), 'javascript:')===0} href="javascript:void(0);" onclick='{$PRINT_TEMPLATE->getUrl()|substr:strlen("javascript:")};'{else} href='{$PRINT_TEMPLATE->getUrl()}' {/if}>{vtranslate($PRINT_TEMPLATE->getLabel(), $MODULE)}</a></li>
                             {/if}
-                            {if isset($FIND_DUPLICATES_EXISTS)}
+                            {if isset($FIND_DUPLICATES_EXISTS) && $FIND_DUPLICATES_EXISTS}
                                 <li class="hide"><a id="{$MODULE}_listView_advancedAction_MERGE_RECORD"  href="javascript:void(0);" onclick='Vtiger_List_Js.triggerMergeRecord()'>{vtranslate('LBL_MERGE_SELECTED_RECORDS', $MODULE)}</a></li>
                             {/if}
                             {foreach item=LISTVIEW_ADVANCEDACTIONS from=$LISTVIEW_LINKS['LISTVIEW']}

layouts/v7/modules/Vtiger/ListViewContents.tpl

@@ -39,7 +39,7 @@
 	<input type="hidden" name="noFilterCache" value="{(isset($NO_SEARCH_PARAMS_CACHE)) ? $NO_SEARCH_PARAMS_CACHE : ''}" id="noFilterCache" >
 	<input type="hidden" name="orderBy" value="{(isset($ORDER_BY)) ? $ORDER_BY : ''}" id="orderBy">
 	<input type="hidden" name="sortOrder" value="{(isset($SORT_ORDER)) ? $SORT_ORDER : ''}" id="sortOrder">
-	<input type="hidden" name="list_headers" value='{(isset($LIST_HEADER_FIELDS)) ? $LIST_HEADER_FIELDS : ''}'/>
+	<input type="hidden" name="list_headers" value='{(isset($LIST_HEADER_FIELDS)) ? $LIST_HEADER_FIELDS : ""}'/>
 	<input type="hidden" name="tag" value="{(isset($CURRENT_TAG)) ? $CURRENT_TAG : ''}" />
 	<input type="hidden" name="folder_id" value="{$FOLDER_ID}" />
 	<input type="hidden" name="folder_value" value="{$FOLDER_VALUE}" />

layouts/v7/modules/Vtiger/PopupContents.tpl

@@ -84,7 +84,7 @@
                     {assign var="RECORD_DATA" value=$LISTVIEW_ENTRY->getRawData()}
                     <tr class="listViewEntries" data-id="{$LISTVIEW_ENTRY->getId()}" {if $MODULE eq 'EmailTemplates'} data-name="{$RECORD_DATA['subject']}" data-info="{$LISTVIEW_ENTRY->get('body')}" {else} data-name="{$LISTVIEW_ENTRY->getName()}" data-info='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($LISTVIEW_ENTRY->getRawData()))}' {/if}
                     {if isset($GETURL) && $GETURL neq ''} data-url='{$LISTVIEW_ENTRY->$GETURL()}' {/if}  id="{$MODULE}_popUpListView_row_{$smarty.foreach.popupListView.index+1}">
-                    {if isset($MULTI_SELECT)}
+                    {if isset($MULTI_SELECT) && $MULTI_SELECT}
                         <td class="{$WIDTHTYPE}">
                             <input class="entryCheckBox" type="checkbox" />
                         </td>

layouts/v7/modules/Vtiger/PopupNavigation.tpl

@@ -11,7 +11,7 @@
 
 {strip}
     <div class="col-md-2">
-        {if isset($MULTI_SELECT)}
+        {if isset($MULTI_SELECT) && $MULTI_SELECT}
             {if !empty($LISTVIEW_ENTRIES)}<button class="select btn btn-default" disabled="disabled"><strong>{vtranslate('LBL_ADD', $MODULE)}</strong></button>{/if}
         {else}
             &nbsp;
@@ -21,4 +21,4 @@
         {assign var=RECORD_COUNT value=$LISTVIEW_ENTRIES_COUNT}
         {include file="Pagination.tpl"|vtemplate_path:$MODULE SHOWPAGEJUMP=true}
     </div>
-{/strip}
\ No newline at end of file
+{/strip}

layouts/v7/modules/Vtiger/ProjectTaskSummaryWidgetContents.tpl

@@ -71,7 +71,7 @@
 													{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
 													<li class="editTaskDetails emptyOption" value=""><a>{vtranslate('LBL_SELECT_OPTION',$MODULE_NAME)}</a></li>
 													{foreach item=PICKLIST_VALUE key=PICKLIST_NAME from=$PICKLIST_VALUES}
-														<li class="editTaskDetails" value="{$PICKLIST_VALUE}"><a>{$PICKLIST_VALUE}</a></li>
+														<li class="editTaskDetails" data-value="{$PICKLIST_NAME}"><a>{$PICKLIST_VALUE}</a></li>
 													{/foreach}
 												</ul>
 											</div>
@@ -96,4 +96,4 @@
 			</div>
 		</div>
 	{/if}
-{/strip}
\ No newline at end of file
+{/strip}

layouts/v7/modules/Vtiger/SelectEmailFields.tpl

@@ -27,7 +27,7 @@
                     {if isset($ALPHABET_VALUE)}
                         <input type="hidden" name="search_value" value="{$ALPHABET_VALUE}" />
                     {/if}
-                    <input type="hidden" name="tag_params" value={ZEND_JSON::encode($TAG_PARAMS)}>
+                    <input type="hidden" name="tag_params" value={if isset($TAG_PARAMS)}{ZEND_JSON::encode($TAG_PARAMS)}{else}''{/if}>
                     {if isset($SEARCH_PARAMS)}
                         <input type="hidden" name="search_params" value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($SEARCH_PARAMS))}' />
                     {/if}

layouts/v7/modules/Vtiger/dashboards/DashBoardWidgetContents.tpl

@@ -12,7 +12,7 @@
 {strip}
     {if php7_count($DATA) gt 0 }
         <input class="widgetData" type=hidden value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($DATA))}' />
-        <input class="yAxisFieldType" type="hidden" value="{$YAXIS_FIELD_TYPE}" />
+        <input class="yAxisFieldType" type="hidden" value="{if isset($YAXIS_FIELD_TYPE)}$YAXIS_FIELD_TYPE{/if}" />
         <div class="row" style="margin:0px 10px;">
             <div class="col-lg-11">
                 <div class="widgetChartContainer" name='chartcontent' style="height:220px;min-width:300px; margin: 0 auto"></div>
@@ -25,4 +25,4 @@
             {vtranslate('LBL_NO')} {vtranslate($MODULE_NAME, $MODULE_NAME)} {vtranslate('LBL_MATCHED_THIS_CRITERIA')}
         </span>
     {/if}
-{/strip}
\ No newline at end of file
+{/strip}

layouts/v7/modules/Vtiger/partials/SidebarEssentials.tpl

@@ -38,7 +38,8 @@
                                 </h6>
                                 <input type="hidden" name="allCvId" value="{CustomView_Record_Model::getAllFilterByModule($MODULE)->get('cvid')}" />
                                 <ul class="lists-menu">
-								{assign var=count value=0}
+								{assign var=shown_count value=0}
+								{assign var=hidden_count value=0}
 								{assign var=LISTVIEW_URL value=$MODULE_MODEL->getListViewUrl()}
                                 {foreach item="CUSTOM_VIEW" from=$GROUP_CUSTOM_VIEWS name="customView"}
                                     {assign var="IS_DEFAULT" value=$CUSTOM_VIEW->isDefault()}
@@ -50,7 +51,12 @@
 										{assign var="SHARED_MEMBER_COUNT" value=1}
 										{/if}
 									{/foreach}
-									<li style="font-size:12px;" class='listViewFilter {if $VIEWID eq $CUSTOM_VIEW->getId() && (isset($CURRENT_TAG) && $CURRENT_TAG eq '')} active {if $smarty.foreach.customView.iteration gt 10} {assign var=count value=1} {/if} {else if $smarty.foreach.customView.iteration gt 10} filterHidden hide{/if} '> 
+                                    {if $smarty.foreach.customView.iteration lte 10} 
+                                        {assign var=shown_count value=$shown_count+1}
+                                    {else} 
+                                        {assign var=hidden_count value=$hidden_count+1} 
+                                    {/if}
+									<li style="font-size:12px;" class='listViewFilter {if $VIEWID eq $CUSTOM_VIEW->getId() && (isset($CURRENT_TAG) && $CURRENT_TAG eq '')} active{else if $smarty.foreach.customView.iteration gt 10} filterHidden hide{/if}'> 
                                         {assign var=VIEWNAME value={vtranslate($CUSTOM_VIEW->get('viewname'), $MODULE)}}
 										{append var="CUSTOM_VIEW_NAMES" value=$VIEWNAME}
                                          <a class="filterName listViewFilterElipsis" href="{$LISTVIEW_URL|cat:'&viewname='|cat:$CUSTOM_VIEW->getId()|cat:'&app='|cat:$SELECTED_MENU_CATEGORY}" oncontextmenu="return false;" data-filter-id="{$CUSTOM_VIEW->getId()}" title="{$VIEWNAME|@escape:'html'}">{$VIEWNAME|@escape:'html'}</a> 
@@ -80,11 +86,9 @@
                                         {/foreach}
                                     </ul>
 								<div class='clearfix'> 
-									{if $smarty.foreach.customView.iteration - 10 - $count} 
-										<a class="toggleFilterSize" data-more-text=" {$smarty.foreach.customView.iteration - 10 - $count} {vtranslate('LBL_MORE',Vtiger)|@strtolower}" data-less-text="Show less">
-											{if $smarty.foreach.customView.iteration gt 10} 
-												{$smarty.foreach.customView.iteration - 10 - $count} {vtranslate('LBL_MORE',Vtiger)|@strtolower} 
-											{/if} 
+									{if $hidden_count} 
+										<a class="toggleFilterSize" data-more-text="{$hidden_count} {vtranslate('LBL_MORE',Vtiger)|@strtolower}" data-less-text="Show less">
+												{$hidden_count} {vtranslate('LBL_MORE',Vtiger)|@strtolower} 
 										</a>{/if} 
 									</div>
                              </div>

layouts/v7/modules/Vtiger/uitypes/Currency.tpl

@@ -12,7 +12,7 @@
 {strip}
 {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
 {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
-{if (!$FIELD_NAME)}
+{if !isset($FIELD_NAME) || empty($FIELD_NAME)}
     {assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()}
 {/if}
 {if $FIELD_MODEL->get('uitype') eq '71'}

layouts/v7/modules/Vtiger/uitypes/Date.tpl

@@ -13,7 +13,7 @@
 {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
 {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
 {assign var="dateFormat" value=$USER_MODEL->get('date_format')}
-{if (!isset($FIELD_NAME))}
+{if (!isset($FIELD_NAME) || !$FIELD_NAME)}
   {assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()}
 {/if}
 <div class="input-group inputElement" style="margin-bottom: 3px">

layouts/v7/modules/Vtiger/uitypes/DateFieldSearchView.tpl

@@ -10,9 +10,9 @@
  ********************************************************************************/
 -->*}
 {strip}
-    {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
-    {assign var="dateFormat" value=$USER_MODEL->get('date_format')}
-    <div class="row-fluid">
-        <input type="text" name="{$FIELD_MODEL->get('name')}" class="listSearchContributor inputElement dateField" data-date-format="{$dateFormat}" data-calendar-type="range" value="{$SEARCH_INFO['searchValue']}" data-fieldinfo='{$FIELD_INFO|escape}'  data-field-type="{$FIELD_MODEL->getFieldDataType()}"/>
+    {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
+    {assign var="dateFormat" value=$USER_MODEL->get('date_format')}
+    <div class="row-fluid">
+        <input type="text" name="{$FIELD_MODEL->get('name')}" class="listSearchContributor inputElement dateField" data-date-format="{$dateFormat}" data-calendar-type="range" value="{if isset($SEARCH_INFO['searchValue'])}{$SEARCH_INFO['searchValue']}{/if}" data-fieldinfo='{$FIELD_INFO|escape}'  data-field-type="{$FIELD_MODEL->getFieldDataType()}"/>
     </div>
 {/strip}
\ No newline at end of file

layouts/v7/modules/Vtiger/uitypes/Email.tpl

@@ -12,7 +12,7 @@
 {strip}
 {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
 {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
-{if (!$FIELD_NAME)}
+{if !isset($FIELD_NAME) || empty($FIELD_NAME)}
   {assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()}
 {/if}
 <input id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" class="inputElement" name="{$FIELD_NAME}" type="text"

layouts/v7/modules/Vtiger/uitypes/FieldSearchView.tpl

@@ -12,6 +12,6 @@
 {strip}
     {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
     <div class="">
-        <input type="text" name="{$FIELD_MODEL->get('name')}" class="listSearchContributor inputElement" value="{$SEARCH_INFO['searchValue']|escape}" data-field-type="{$FIELD_MODEL->getFieldDataType()}" data-fieldinfo='{$FIELD_INFO|escape}'/>
+        <input type="text" name="{$FIELD_MODEL->get('name')}" class="listSearchContributor inputElement" value="{if isset($SEARCH_INFO['searchValue'])}{$SEARCH_INFO['searchValue']|escape}{/if}" data-field-type="{$FIELD_MODEL->getFieldDataType()}" data-fieldinfo='{$FIELD_INFO|escape}'/>
     </div>
 {/strip}

layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl

@@ -13,12 +13,16 @@
     {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
 	{assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
 	{assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
-    {assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
+    {if isset($SEARCH_INFO['searchValue']) && $SEARCH_INFO['searchValue'] !== null}
+        {assign var=SEARCH_VALUES value=explode(',', $SEARCH_INFO['searchValue'])}
+    {else}
+        {assign var=SEARCH_VALUES value=array()}
+    {/if}
     <div class="select2_search_div">
         <input type="text" class="listSearchContributor inputElement select2_input_element"/>
         <select class="select2 listSearchContributor" name="{$FIELD_MODEL->get('name')}" multiple data-fieldinfo='{$FIELD_INFO|escape}' style="display:none">
         {foreach item=PICKLIST_LABEL key=PICKLIST_KEY from=$PICKLIST_VALUES}
-                <option value="{$PICKLIST_KEY}" {if in_array($PICKLIST_KEY,$SEARCH_VALUES) && ($PICKLIST_KEY neq "") } selected{/if}>{$PICKLIST_LABEL}</option>
+                <option value="{$PICKLIST_KEY}" {if isset($SEARCH_VALUES) && in_array($PICKLIST_KEY,$SEARCH_VALUES) && ($PICKLIST_KEY neq "") } selected{/if}>{$PICKLIST_LABEL}</option>
         {/foreach}
     </select>
     </div>

layouts/v7/modules/Vtiger/uitypes/Reference.tpl

@@ -51,7 +51,7 @@
             <span class="input-group-addon relatedPopup cursorPointer" title="{vtranslate('LBL_SELECT', $MODULE)}">
                 <i id="{$MODULE}_editView_fieldName_{$FIELD_NAME}_select" class="fa fa-search"></i>
             </span>
-        {if (($REQ->get('view') eq 'Edit') or ($MODULE_NAME eq 'Webforms')) && !in_array($REFERENCE_LIST[0],$QUICKCREATE_RESTRICTED_MODULES)}
+        {if (($REQ->get('view') eq 'Edit') or ($MODULE_NAME eq 'Webforms')) && ($REFERENCE_LIST && !in_array($REFERENCE_LIST[0],$QUICKCREATE_RESTRICTED_MODULES))}
             <span class="input-group-addon createReferenceRecord cursorPointer clearfix" title="{vtranslate('LBL_CREATE', $MODULE)}">
             <i id="{$MODULE}_editView_fieldName_{$FIELD_NAME}_create" class="fa fa-plus"></i>
         </span>
@@ -59,4 +59,4 @@
     </div>
 
 </div>
-{/strip}
\ No newline at end of file
+{/strip}

layouts/v7/modules/Vtiger/uitypes/Salutation.tpl

@@ -8,7 +8,7 @@
 *************************************************************************************}
 
 {strip}
-	{if $SALUTATION_FIELD_MODEL}
+	{if isset($SALUTATION_FIELD_MODEL)}
 		{assign var=PICKLIST_VALUES value=$SALUTATION_FIELD_MODEL->getEditablePicklistValues()}
 		{assign var="SALUTATION_VALIDATOR" value=$SALUTATION_FIELD_MODEL->getValidator()}
 		<select class="inputElement select2" style="width:78px;" name="{$SALUTATION_FIELD_MODEL->get('name')}" >
@@ -32,4 +32,4 @@
 			{/if}
 	/>
 	{* TODO - Handler Ticker Symbol field *}
-{/strip}
\ No newline at end of file
+{/strip}

layouts/v7/modules/Vtiger/uitypes/Text.tpl

@@ -12,7 +12,7 @@
 {strip}
 {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
 {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
-{if !isset($FIELD_NAME)}
+{if !isset($FIELD_NAME) || !$FIELD_NAME}
   {assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()}
 {/if}
 {assign var="fieldValue" value=purifyHtmlEventAttributes($FIELD_MODEL->get('fieldvalue'),true)}

layouts/v7/resources/application.js

@@ -568,3 +568,13 @@ if (jQuery.ajaxPrefilter) {
     }
   });
 }
+
+/**
+ * JSON override to handle empty string to null.
+ * When values are picked from DOM attribute it could be empty.
+ */
+_JSONParse = JSON.parse
+JSON.parse = function(value) {
+	if (value == '') return null;
+	return _JSONParse(value);
+}