0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

fix a bug where setting video points would not register on load

Browse source
This commit is contained in:
rolux 2011-11-08 09:03:23 +00:00
parent 4ae468c6f8
commit c490d25250
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
static/js/pandora/UI.js
View file

@ -65,7 +65,7 @@ pandora.UI = (function() {
} }
add.itemFind = pandora.site.user.ui.itemFind; add.itemFind = pandora.site.user.ui.itemFind;
if (list != self.previousUI._list) { if (list != self.previousUI._list) {
Ox.Log('', 'FIND HAS CHANGED LIST') Ox.Log('UI', 'FIND HAS CHANGED LIST')
// if find has changed list // if find has changed list
Ox.forEach(listSettings, function(listSetting, setting) { Ox.forEach(listSettings, function(listSetting, setting) {
// then for each setting that corresponds to a list setting // then for each setting that corresponds to a list setting
@ -94,8 +94,8 @@ pandora.UI = (function() {
// (but don't trigger an additional event) // (but don't trigger an additional event)
add.listSelection = []; add.listSelection = [];
} else if (['text', 'position'].indexOf(pandora.user.ui.listSort[0].key) > -1) { } else if (['text', 'position'].indexOf(pandora.user.ui.listSort[0].key) > -1) {
// when switchin to a non-clip view, with a sort key that // when switchin to a non-clip view, with a sort key
// only exists in clip view, reset sort to default // that only exists in clip view, reset sort to default
args.listSort = pandora.site.user.ui.listSort; args.listSort = pandora.site.user.ui.listSort;
} }
} }
@ -127,9 +127,11 @@ pandora.UI = (function() {
!args.itemView !args.itemView
&& ['video', 'timeline'].indexOf(pandora.user.ui.itemView) > -1 && ['video', 'timeline'].indexOf(pandora.user.ui.itemView) > -1
&& !pandora.user.ui.videoPoints[item] && !pandora.user.ui.videoPoints[item]
&& !args['videoPoints.' + item]
) { ) {
// if the item view won't be changed, remains a video view, // if the item view doesn't change, remains a video view,
// and there are no video points yet, add default video points // video points don't exist yet, and won't be set,
// add default video points
add['videoPoints.' + item] = {'in': 0, out: 0, position: 0}; add['videoPoints.' + item] = {'in': 0, out: 0, position: 0};
} }
} }
@ -137,8 +139,12 @@ pandora.UI = (function() {
if (['video', 'timeline'].indexOf(args.itemView) > -1) { if (['video', 'timeline'].indexOf(args.itemView) > -1) {
// when switching to a video view, add it as default video view // when switching to a video view, add it as default video view
args.videoView = args.itemView; args.videoView = args.itemView;
if (!pandora.user.ui.videoPoints[item]) { if (
// if there are no video points yet, add default video points !pandora.user.ui.videoPoints[item]
&& !args['videoPoints.' + item]
) {
// if video points don't exist yet, and won't be set,
// add default video points
add['videoPoints.' + item] = {'in': 0, out: 0, position: 0}; add['videoPoints.' + item] = {'in': 0, out: 0, position: 0};
} }
} }

4
static/js/pandora/URL.js
View file

@ -45,7 +45,7 @@ pandora.URL = (function() {
); );
} }
Ox.Log('STATE .................... ->', state) Ox.Log('URL', 'STATE ...', state)
return state; return state;
@ -110,7 +110,7 @@ pandora.URL = (function() {
if (['video', 'timeline'].indexOf(state.view) > -1) { if (['video', 'timeline'].indexOf(state.view) > -1) {
// fixme: this doesn't handle annotation ids // fixme: this doesn't handle annotation ids
set['videoPoints.' + state.item] = { set['videoPoints.' + state.item] = {
position: state.span[0], position: state.span[0] || 0,
'in': state.span[1] || 0, 'in': state.span[1] || 0,
out: Math.max(state.span[1] || 0, state.span[2] || 0) out: Math.max(state.span[1] || 0, state.span[2] || 0)
} }