CAMP/it
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dont use Ox.merge

Browse Source
This commit is contained in:
Sanj 2011-04-11 03:43:16 +05:30
parent d105d77c46
commit da968593b6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
itf/static/js/itf/boxes.js
View File

@ -3,8 +3,8 @@
*/ */
Ox.ItfPage = function(page, parentPanel) { Ox.ItfPage = function(page, parentPanel) {
var panelItems = []; var panelItems = [];
Ox.print("page", page); // Ox.print("page", page);
GLOB_PAGE = page; // GLOB_PAGE = page;
for (var i=0; i < page.displayed.length; i++) { for (var i=0; i < page.displayed.length; i++) {
var t = page.displayed[i]; var t = page.displayed[i];
var displayed = true; var displayed = true;
@ -77,6 +77,11 @@ Ox.ItfBox = function(boxData) {
.html(boxData.title) .html(boxData.title)
.appendTo($titlebar); .appendTo($titlebar);
var $buttons = new Ox.Element().appendTo($title).css({'position': 'absolute', 'top': '1px', 'right': '10px'}); var $buttons = new Ox.Element().appendTo($title).css({'position': 'absolute', 'top': '1px', 'right': '10px'});
var boxButtons = ItfBoxTypes[boxData.type].buttons;
for (var i=0; i<boxData.extra_buttons.length; i++) {
var t = boxData.extra_buttons[i];
boxButtons.push(t);
}
var boxButtons = Ox.merge(ItfBoxTypes[boxData.type].buttons, boxData.extra_buttons); var boxButtons = Ox.merge(ItfBoxTypes[boxData.type].buttons, boxData.extra_buttons);
for (var i=0; i<boxButtons.length; i++) { for (var i=0; i<boxButtons.length; i++) {
var t = boxButtons[i]; var t = boxButtons[i];