holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore some new attributes, preserve settings when value is not an object

Browse Source
This commit is contained in:
Nathan Gray 2015-01-13 22:00:12 +00:00
parent c961edcc59
commit 2404ebda6e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etemplate/js/et2_widget_portlet.js
View File

@ -60,8 +60,9 @@ var et2_portlet = et2_valueWidget.extend(
},
"width": { "default": 2, "ignore": true},
"height": { "default": 1, "type": "integer"},
"rows": {"ignore": true},
"cols": {"ignore": true},
"rows": {"ignore": true, default: et2_no_init},
"cols": {"ignore": true, default: et2_no_init},
"resize_ratio": {"ignore": true, default: et2_no_init}, // Portlets are explicitly sized
"row": {
"name": "Row",
"description": "Home page location (row) - handled by home app",
@ -306,7 +307,10 @@ var et2_portlet = et2_valueWidget.extend(
);
// Extend, not replace, because settings has types while value has just value
jQuery.extend(this.options.settings, value);
if(typeof value == 'object')
{
jQuery.extend(this.options.settings, value);
}
},
/**