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

update URL controller (new user ui keys, encode text item)

Browse source
This commit is contained in:
rolux 2013-08-07 14:46:53 +00:00
parent f55ee96871
commit c1229438bf
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
static/js/URL.js
View file

@ -55,7 +55,7 @@ pandora.URL = (function() {
); );
} }
} else if (pandora.user.ui.section == 'edits') { } else if (pandora.user.ui.section == 'edits') {
var editPoints = pandora.user.ui.editPoints[state.item] || {}; var editPoints = pandora.user.ui.edits[state.item] || {};
state.span = editPoints.clip || [].concat( state.span = editPoints.clip || [].concat(
editPoints.position editPoints.position
? editPoints.position ? editPoints.position
@ -65,7 +65,7 @@ pandora.URL = (function() {
: [] : []
); );
} else if (pandora.user.ui.section == 'texts') { } else if (pandora.user.ui.section == 'texts') {
var position = pandora.user.ui.textPositions[pandora.user.ui.text]; var position = pandora.user.ui.texts[pandora.user.ui.text].position;
if (position) { if (position) {
state.span = position; state.span = position;
} }
@ -197,25 +197,24 @@ pandora.URL = (function() {
} else if (state.type == 'edits') { } else if (state.type == 'edits') {
if (state.span) { if (state.span) {
var key = 'edits.' + state.item.replace(/\./g, '\\.');
if (Ox.isArray(state.span)) { if (Ox.isArray(state.span)) {
set['editPoints.' + state.item.replace(/\./g, '\\.')] = { set[key + '.clip'] = '';
clip: '', set[key + '.in'] = state.span[state.span.length - 2] || 0;
'in': state.span[state.span.length - 2] || 0, set[key + '.out'] = state.span.length == 1 ? 0 : Math.max(
out: state.span.length == 1 ? 0 : Math.max( state.span[state.span.length - 2],
state.span[state.span.length - 2], state.span[state.span.length - 1]
state.span[state.span.length - 1] );
), set[key + '.position'] = state.span[0];
position: state.span[0]
}
} else { } else {
set['editPoints.' + state.item.replace(/\./g, '\\.') + '.clip'] = state.span; set[key + '.clip'] = state.span;
} }
} }
} else if (state.type == 'texts') { } else if (state.type == 'texts') {
if (state.span) { if (state.span) {
set['textPositions.' + state.item] = state.span; set['texts.' + state.item.replace(/\./g, '\\.') + '.position'] = state.span;
} }
} }
@ -493,7 +492,8 @@ pandora.URL = (function() {
'mapFind', 'mapSelection' 'mapFind', 'mapSelection'
].indexOf(key) > -1 ].indexOf(key) > -1
|| /^videoPoints/.test(key) || /^videoPoints/.test(key)
|| /^textPositions/.test(key); || /^edits/.test(key)
|| /^texts/.test(key);
}) })
) { ) {
action = 'replace'; action = 'replace';