0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

set value of Ox.Editable

Browse source
This commit is contained in:
j 2012-01-20 23:41:07 +05:30
parent 7475ef0124
commit d8adee70f7
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/Ox.UI/css/Ox.UI.css
View file

@ -783,6 +783,7 @@ OxEditable
.OxEditableElement > .OxValue { .OxEditableElement > .OxValue {
//cursor: pointer; //cursor: pointer;
padding: 0 0 0 1px; padding: 0 0 0 1px;
word-wrap: break-word;
} }
.OxEditableElement div.OxInput { .OxEditableElement div.OxInput {
padding: 0 1px 0 0; padding: 0 1px 0 0;

2
source/Ox.UI/js/Form/Ox.Editable.js
View file

@ -233,6 +233,8 @@ Ox.Editable = function(options, self) {
self.$test && self.$test.css(css); self.$test && self.$test.css(css);
self.$input && self.$input.css(css); self.$input && self.$input.css(css);
self.$input && self.$input.find(self.options.type).css(css); self.$input && self.$input.find(self.options.type).css(css);
} else if (key == 'value') {
self.$value.html(formatValue());
} }
}; };

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

@ -160,7 +160,7 @@ Ox.AnnotationFolder = function(options, self) {
// only deselect annotation if the place deselect was not // only deselect annotation if the place deselect was not
// caused by switching to an annotation without place // caused by switching to an annotation without place
self.$annotations.options({selected: ''}); self.$annotations.options({selected: ''});
} else if (data.annotationIds.indexOf(self.options.selected) == -1) { } else if (data.annotationIds && data.annotationIds.indexOf(self.options.selected) == -1) {
// only select a new annotation if the currently selected // only select a new annotation if the currently selected
// annotation does not match the selected place // annotation does not match the selected place
self.$annotations.options({selected: data.annotationIds[0]}); self.$annotations.options({selected: data.annotationIds[0]});