sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

fix alphabetical order of annotations with tags, fixes #681

Browse source
This commit is contained in:
rlx 2012-03-20 09:34:50 +00:00
commit bc3fedb125
4 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
source/Ox.UI/js/Form/Ox.ArrayEditable.js
View file

@ -11,6 +11,7 @@ Ox.ArrayEditable = function(options, self) {
.defaults({
clickLink: null,
editable: true,
getSortValue: null,
highlight: '',
itemName: 'item',
items: [],
@ -208,7 +209,6 @@ Ox.ArrayEditable = function(options, self) {
self.editing = false;
that.blurItem();
}
Ox.print('SELECT ITEM', self.options.selected, self.selected);
that.find('.OxSelected').removeClass('OxSelected');
self.selected > -1 && self.$items[self.selected].addClass('OxSelected');
triggerSelectEvent();
@ -279,7 +279,13 @@ Ox.ArrayEditable = function(options, self) {
function sortItems() {
if (!Ox.isEmpty(self.options.sort)) {
self.options.items = Ox.sortBy(self.options.items, self.options.sort);
self.options.items = Ox.sortBy(
self.options.items,
self.options.sort,
self.options.getSortValue
? {value: self.options.getSortValue}
: {}
);
self.selected = getSelectedPosition();
}
}

1
source/Ox.UI/js/Menu/Ox.Menu.js
View file

@ -600,7 +600,6 @@ Ox.Menu = function(options, self) {
if (ids.length == 1) {
item = that.getItem(id);
group = item.options('group');
Ox.Log('Menu', 'checkItem', id, item, that.submenus)
if (group) {
offset = self.optionGroupOffset[group];
position = getItemPositionById(id);

7
source/Ox.UI/js/Video/Ox.AnnotationFolder.js
View file

@ -199,6 +199,11 @@ Ox.AnnotationFolder = function(options, self) {
self.$annotations = Ox.ArrayEditable({
clickLink: self.options.clickLink,
editable: self.options.editable,
getSortValue: self.options.type == 'text'
? function(value) {
return Ox.stripTags(value);
}
: null,
highlight: self.options.highlight,
items: self.annotations,
placeholder: 'No ' + self.options.title,
@ -540,7 +545,6 @@ Ox.AnnotationFolder = function(options, self) {
if (value === '') {
self.editing = false;
}
value && Ox.print('----------------- select item in folder', value, self.options.collapsed)
if (value && self.options.collapsed) {
self.$panel.options({animate: false});
self.$panel.options({collapsed: false});
@ -620,7 +624,6 @@ Ox.AnnotationFolder = function(options, self) {
};
that.updateItem = function(id, data) {
Ox.print('-- UPDATE ITEM', id, data);
var item = Ox.getObjectById(self.options.items, id);
Ox.forEach(data, function(value, key) {
item[key] = value;