Silence some missing attribute settings warnings and fix warning about not loading app.js when it was already loaded

This commit is contained in:
Nathan Gray 2013-08-14 18:01:22 +00:00
parent 42e66e9319
commit eec6791213
4 changed files with 21 additions and 2 deletions

View File

@ -1905,6 +1905,16 @@ et2_register_widget(et2_nextmatch_customfields, ['nextmatch-customfields']);
*/ */
var et2_nextmatch_sortheader = et2_nextmatch_header.extend(et2_INextmatchSortable, var et2_nextmatch_sortheader = et2_nextmatch_header.extend(et2_INextmatchSortable,
{ {
attributes: {
"sortmode": {
"name": "Sort order",
"type": "string",
"description": "Default sort order",
"translate": false
}
},
legacyOptions: ['sortmode'],
/** /**
* Constructor * Constructor
* *
@ -1928,6 +1938,14 @@ var et2_nextmatch_sortheader = et2_nextmatch_header.extend(et2_INextmatchSortabl
return false; return false;
}, },
/**
* Wrapper to join up interface * framework
*/
set_sortmode: function(_mode)
{
this.setSortmode(_mode);
},
/** /**
* Function which implements the et2_INextmatchSortable function. * Function which implements the et2_INextmatchSortable function.
*/ */

View File

@ -91,7 +91,7 @@ var et2_tree = et2_inputWidget.extend(
"name": "Standard images", "name": "Standard images",
"type": "string", "type": "string",
"default": "", "default": "",
"descripton": "comma-separated names of icons for a leaf, closed and opend folder (default: leaf.gif,folderClosed.gif,folderOpen.gif), images with extension get loaded from image_path, just 'image' or 'appname/image' are allowed too" "description": "comma-separated names of icons for a leaf, closed and opend folder (default: leaf.gif,folderClosed.gif,folderOpen.gif), images with extension get loaded from image_path, just 'image' or 'appname/image' are allowed too"
} }
}, },

View File

@ -236,6 +236,7 @@ var et2_vfsMime = et2_valueWidget.extend([et2_IDetachedDOM],
"description": "Array of (stat) information about the file" "description": "Array of (stat) information about the file"
}, },
"size": { "size": {
"name": "Icon size",
"type": "integer", "type": "integer",
"description": "Size of icon / thumbnail, in pixels", "description": "Size of icon / thumbnail, in pixels",
"default": et2_no_init "default": et2_no_init

View File

@ -201,7 +201,7 @@ etemplate2.prototype.load = function(_name, _url, _data, _callback)
{ {
(function() { new app[appname]();}).call(); (function() { new app[appname]();}).call();
} }
else else if (typeof app[appname] !== "object")
{ {
egw.debug("warn", "Did not load '%s' JS object",appname); egw.debug("warn", "Did not load '%s' JS object",appname);
} }