From 55e2174831028f8c489d74ac15346221d2b3515e Mon Sep 17 00:00:00 2001 From: rolux Date: Wed, 27 Jun 2012 20:38:07 +0200 Subject: [PATCH] in TableLists, use options.unique, not options.columns[i].unique --- source/Ox.UI/js/Calendar/CalendarEditor.js | 4 ++-- source/Ox.UI/js/Form/FileInput.js | 4 ++-- source/Ox.UI/js/Form/FormPanel.js | 2 +- source/Ox.UI/js/List/Chart.js | 3 ++- source/Ox.UI/js/Map/MapEditor.js | 11 ++--------- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/source/Ox.UI/js/Calendar/CalendarEditor.js b/source/Ox.UI/js/Calendar/CalendarEditor.js index cf76eb39..27b0c66c 100644 --- a/source/Ox.UI/js/Calendar/CalendarEditor.js +++ b/source/Ox.UI/js/Calendar/CalendarEditor.js @@ -141,7 +141,6 @@ Ox.CalendarEditor = function(options, self) { }, operator: '-', title: 'Duration', - unique: true, visible: true, width: 256 }, @@ -239,7 +238,8 @@ Ox.CalendarEditor = function(options, self) { pageLength: self.options.pageLength, scrollbarVisible: true, selected: self.options.selected ? [self.options.selected] : [], - sort: self.options.sort + sort: self.options.sort, + unique: 'id' }) .bindEvent({ 'delete': removeEvent, diff --git a/source/Ox.UI/js/Form/FileInput.js b/source/Ox.UI/js/Form/FileInput.js index bf3b4fe9..c4b992c7 100644 --- a/source/Ox.UI/js/Form/FileInput.js +++ b/source/Ox.UI/js/Form/FileInput.js @@ -141,13 +141,13 @@ Ox.FileInput = function(options, self) { }); }, id: 'id', - unique: true, visible: true, width: 28 } ], items: getItems(), - sort: [{key: 'name', operator: '+'}] + sort: [{key: 'name', operator: '+'}], + unique: 'id' }) .css({ left: 0, diff --git a/source/Ox.UI/js/Form/FormPanel.js b/source/Ox.UI/js/Form/FormPanel.js index 89024239..ecc9efda 100644 --- a/source/Ox.UI/js/Form/FormPanel.js +++ b/source/Ox.UI/js/Form/FormPanel.js @@ -23,7 +23,6 @@ Ox.FormPanel = function(options, self) { columns: [ { id: 'id', - unique: true, visible: false }, { @@ -63,6 +62,7 @@ Ox.FormPanel = function(options, self) { min: 1, selected: [self.options.form[0].id], sort: [{key: 'id', operator: '+'}], + unique: 'id', width: 256 }).bindEvent({ select: function(data) { diff --git a/source/Ox.UI/js/List/Chart.js b/source/Ox.UI/js/List/Chart.js index ead4c2be..376ef454 100644 --- a/source/Ox.UI/js/List/Chart.js +++ b/source/Ox.UI/js/List/Chart.js @@ -176,7 +176,8 @@ Ox.Chart = function(options, self) { min: 0, pageLength: self.items.length, sort: [self.options.sort], - width: self.options.width + width: self.options.width, + unique: 'key' }) .css({ left: 0, diff --git a/source/Ox.UI/js/Map/MapEditor.js b/source/Ox.UI/js/Map/MapEditor.js index 24b49087..8e9303ec 100644 --- a/source/Ox.UI/js/Map/MapEditor.js +++ b/source/Ox.UI/js/Map/MapEditor.js @@ -76,14 +76,6 @@ Ox.MapEditor = function(options, self) { }; self.columns = [ - { - addable: false, // fixme: implement - id: 'id', - title: 'Id', - unique: true, - visible: false, - width: 32 - }, { format: function(value, data) { return data.type @@ -345,7 +337,8 @@ Ox.MapEditor = function(options, self) { pageLength: self.options.pageLength, scrollbarVisible: true, selected: self.options.selected ? [self.options.selected] : [], - sort: self.options.sort + sort: self.options.sort, + unique: 'id' }) .bindEvent({ 'delete': removeItem,