extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-22 13:58:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent some warnings about attributes

Browse Source
This commit is contained in:
Nathan Gray 2012-03-23 19:25:50 +00:00
parent be878e3e79
commit c39b76f8a9
3 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/js/et2_extension_nextmatch.js
View File

@ -1076,6 +1076,11 @@ var et2_nextmatch_header = et2_baseWidget.extend(et2_INextmatchHeader, {
"type": "string", "type": "string",
"description": "Caption for the nextmatch header", "description": "Caption for the nextmatch header",
"translate": true "translate": true
},
"onchange": {
"name": "onchange",
"type": "string",
"description": "JS code which is executed when the value changes."
} }
}, },

32
etemplate/js/et2_widget_button.js
View File

@ -35,10 +35,19 @@ var et2_button = et2_baseWidget.extend([et2_IInput, et2_IDetachedDOM], {
"type": "string", "type": "string",
"description": "Use an icon instead of label (when available)" "description": "Use an icon instead of label (when available)"
}, },
"ro_image": {
"name": "Read-only Icon",
"type": "string",
"description": "Use this icon instead of hiding for read-only"
},
"onclick": { "onclick": {
"name": "onclick", "name": "onclick",
"type": "string", "type": "string",
"description": "JS code which gets executed when the button is clicked" "description": "JS code which gets executed when the button is clicked"
},
// No such thing as a required button
"needed": {
"ignore": true,
} }
}, },
@ -50,7 +59,7 @@ var et2_button = et2_baseWidget.extend([et2_IInput, et2_IDetachedDOM], {
this.btn = null; this.btn = null;
this.image = null; this.image = null;
if (this.options.image) if (this.options.image || this.options.ro_image)
{ {
this.image = jQuery(document.createElement("img")) this.image = jQuery(document.createElement("img"))
.addClass("et2_button et2_button_icon"); .addClass("et2_button et2_button_icon");
@ -65,9 +74,23 @@ var et2_button = et2_baseWidget.extend([et2_IInput, et2_IDetachedDOM], {
} }
}, },
set_ro_image: function(_image) {
if(this.options.readonly)
{
this.set_image(_image);
}
},
set_image: function(_image) { set_image: function(_image) {
if(!this.isInTree() || this.image == null) return; if(!this.isInTree() || this.image == null) return;
// Silently blank for percentages instead of warning about missing image - use a progress widget
if(_image.match(/[0-9]+\%/))
{
_image = "";
//this.egw().debug("warn", "Use a progress widget instead of percentage images", this);
}
this.options.image = _image; this.options.image = _image;
var found_image = false; var found_image = false;
@ -160,7 +183,7 @@ var et2_button = et2_baseWidget.extend([et2_IInput, et2_IDetachedDOM], {
*/ */
getDetachedAttributes: function(_attrs) getDetachedAttributes: function(_attrs)
{ {
_attrs.push("label", "value", "class", "image", "onclick" ); _attrs.push("label", "value", "class", "image", "ro_image","onclick" );
}, },
getDetachedNodes: function() getDetachedNodes: function()
@ -192,7 +215,10 @@ var et2_button = et2_baseWidget.extend([et2_IInput, et2_IDetachedDOM], {
{ {
this.set_image(_values["image"]); this.set_image(_values["image"]);
} }
if (typeof _values["ro_image"] != "undefined")
{
this.set_ro_image(_values["ro_image"]);
}
if (typeof _values["class"] != "undefined") if (typeof _values["class"] != "undefined")
{ {
this.set_class(_values["class"]); this.set_class(_values["class"]);

12
etemplate/js/et2_widget_grid.js
View File

@ -26,6 +26,18 @@
*/ */
var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM], { var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM], {
attributes: {
// Better to use CSS, no need to warn about it
"border": {
"ignore": true
},
"spacing": {
"ignore": true
},
"padding": {
"ignore": true
}
},
init: function() { init: function() {
// Create the table body and the table // Create the table body and the table
this.tbody = $j(document.createElement("tbody")); this.tbody = $j(document.createElement("tbody"));