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

url controller update

Browse source
This commit is contained in:
rolux 2011-09-17 07:07:59 +00:00
commit deb208dcba
13 changed files with 248 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

2
static/js/pandora/ui/browser.js
View file

@ -24,7 +24,7 @@ pandora.ui.browser = function() {
.bindEvent({
resize: function(event, data) {
pandora.user.ui.groupsSize = data;
$.each(pandora.$ui.groups, function(i, list) {
pandora.$ui.groups.forEach(function(list) {
list.size();
});
},

3
static/js/pandora/ui/foldersList.js
View file

@ -362,7 +362,8 @@ pandora.ui.folderList = function(id) {
});
pandora.URL.set('?find=' + (id == 'volumes' ? 'volume' : 'list') + ':' + data.ids[0]);
} else {
pandora.URL.set('?find=');
pandora.UI.set({list: ''});
pandora.URL.set('');
}
},
submit: function(event, data) {

2
static/js/pandora/ui/group.js
View file

@ -58,7 +58,7 @@ pandora.ui.group = function(id) {
items: function(data, callback) {
//if (pandora.user.ui.showGroups) {
delete data.keys;
return pandora.api.find($.extend(data, {
return pandora.api.find(Ox.extend(data, {
group: id,
query: pandora.user.ui.groupsData[i].query
}), callback);

2
static/js/pandora/ui/home.js
View file

@ -62,6 +62,7 @@ pandora.ui.home = function() {
})
.bind({
click: function() {
pandora.URL.pushPrevious();
that.fadeOutScreen();
}
})
@ -124,6 +125,7 @@ pandora.ui.home = function() {
})
.bindEvent({
click: function() {
pandora.URL.pushPrevious();
that.fadeOutScreen();
}
})

92
static/js/pandora/ui/item.js
View file

@ -1,17 +1,32 @@
// vim: et:ts=4:sw=4:sts=4:ft=javascript
pandora.ui.item = function() {
var that = Ox.Element();
pandora.api.get({
id: pandora.user.ui.item,
keys: []
}, pandora.user.level == 'admin' && pandora.user.ui.itemView == 'info' ? 0 : -1, function(result) {
if (result.status.code == 200) {
// fixme: probably does not belong here
document.title = '0xDB - ' + result.data.title;
if (pandora.user.ui.videoPoints[result.data.id].out == -1) {
pandora.UI.set('videoPoints|' + result.data.id + '|out', result.data.duration);
pandora.URL.replace(
document.location.pathname
+ Ox.formatDuration(result.data.duration, 3).replace(/\.000$/, '')
);
}
}
if (result.status.code != 200) {
// fixme: this is quite a hack
var title = decodeURI(pandora.user.ui.item).toLowerCase(),
videoPosition;
if (pandora.user.ui.item in pandora.user.ui.videoPosition) {
videoPosition = pandora.user.ui.videoPosition[pandora.user.ui.item];
pandora.UI.set(['videoPosition', pandora.user.ui.item].join('|'), null);
videoPoints;
if (pandora.user.ui.item in pandora.user.ui.videoPoints) {
videoPoints = pandora.user.ui.videoPoints[pandora.user.ui.item];
pandora.UI.set(['videoPoints', pandora.user.ui.item].join('|'), null);
}
pandora.api.find({
query: {
@ -37,8 +52,8 @@ pandora.ui.item = function() {
- re.exact.test(a.title) * 2000000;
})[0].id;
pandora.user.ui.item = '';
!Ox.isUndefined(videoPosition)
&& pandora.UI.set(['videoPosition', id].join('|'), videoPosition);
!Ox.isUndefined(videoPoints)
&& pandora.UI.set(['videoPoints', id].join('|'), videoPoints);
pandora.URL.set(id);
} else {
pandora.$ui.contentPanel.replaceElement(1,
@ -52,9 +67,9 @@ pandora.ui.item = function() {
);
}
});
} else if (!result.data.rendered &&
['clips', 'map',
'player', 'timeline'].indexOf(pandora.user.ui.itemView)>-1) {
} else if (!result.data.rendered && [
'clips', 'map', 'player', 'timeline'
].indexOf(pandora.user.ui.itemView)>-1) {
pandora.$ui.contentPanel.replaceElement(1,
Ox.Element()
.css({marginTop: '32px', fontSize: '12px', textAlign: 'center'})
@ -64,8 +79,10 @@ pandora.ui.item = function() {
+ pandora.user.ui.itemView + ' view.'
)
);
} else if (pandora.user.ui.itemView == 'calendar') {
pandora.$ui.contentPanel.replaceElement(1, Ox.Element().html('Calendar'));
} else if (pandora.user.ui.itemView == 'clips') {
var ratio = result.data.stream.aspectRatio;
Ox.print('RATIO', ratio)
@ -86,7 +103,7 @@ pandora.ui.item = function() {
};
},
items: function(data, callback) {
pandora.api.findAnnotations($.extend(data, {
pandora.api.findAnnotations(Ox.extend(data, {
itemQuery: {
conditions:[{
key: 'id',
@ -104,11 +121,17 @@ pandora.ui.item = function() {
open: function(event, data) {
var id = data.ids[0],
item = pandora.user.ui.item,
position = pandora.$ui.clips.value(id, 'in');
pandora.UI.set('videoPosition|' + item, position);
points = {
'in': pandora.$ui.clips.value(id, 'in'),
out: pandora.$ui.clips.value(id, 'out')
};
pandora.UI.set('videoPoints|' + item, Ox.extend(points, {
position: points['in']
}));
pandora.URL.set(item + '/timeline');
}
}));
} else if (pandora.user.ui.itemView == 'info') {
//Ox.print('result.data', result.data)
if (pandora.user.level == 'admin' && false) {
@ -239,8 +262,13 @@ pandora.ui.item = function() {
open: function(event, data) {
var id = data.ids[0],
item = pandora.user.ui.item,
position = pandora.$ui.clips.value(id, 'in');
pandora.UI.set('videoPosition|' + item, position);
points = {
'in': pandora.$ui.clips.value(id, 'in'),
out: pandora.$ui.clips.value(id, 'out')
};
pandora.UI.set('videoPoints|' + item, Ox.extend(points, {
position: points['in']
}));
pandora.URL.set(item + '/timeline');
}
}),
@ -253,6 +281,7 @@ pandora.ui.item = function() {
.bindEvent('resize', function() {
pandora.$ui.map.resizeMap();
}));
} else if (pandora.user.ui.itemView == 'statistics') {
var stats = Ox.Container();
Ox.TreeList({
@ -262,7 +291,6 @@ pandora.ui.item = function() {
pandora.$ui.contentPanel.replaceElement(1, stats);
} else if (pandora.user.ui.itemView == 'player') {
// fixme: duplicated
var layers = [],
@ -285,8 +313,10 @@ pandora.ui.item = function() {
return '/' + pandora.user.ui.item + '/timeline64p' + i + '.png';
},
height: pandora.$ui.contentPanel.size(1),
'in': pandora.user.ui.videoPoints[pandora.user.ui.item]['in'],
muted: pandora.user.ui.videoMuted,
position: pandora.user.ui.videoPosition[pandora.user.ui.item] || 0,
out: pandora.user.ui.videoPoints[pandora.user.ui.item].out,
position: pandora.user.ui.videoPoints[pandora.user.ui.item].position,
scaleToFill: pandora.user.ui.videoScale == 'fill',
showAnnotations: pandora.user.ui.showAnnotations,
showControls: pandora.user.ui.showControls,
@ -318,11 +348,12 @@ pandora.ui.item = function() {
pandora.UI.set('volume', data.volume);
},
}));
} else if (pandora.user.ui.itemView == 'timeline') {
var layers = [],
video = {};
$.each(pandora.site.layers, function(i, layer) {
layers[i] = $.extend({}, layer, {items: result.data.layers[layer.id]});
pandora.site.layers.forEach(function(layer) {
layers.push(Ox.extend({items: result.data.layers[layer.id]}, layer));
});
pandora.site.video.resolutions.forEach(function(resolution) {
video[resolution] = Ox.range(result.data.parts).map(function(i) {
@ -346,10 +377,11 @@ pandora.ui.item = function() {
},
height: pandora.$ui.contentPanel.size(1),
id: 'editor',
'in': 0,
'in': pandora.user.ui.videoPoints[pandora.user.ui.item]['in'],
layers: layers,
out: 0,
position: pandora.user.ui.videoPosition[pandora.user.ui.item] || 0,
muted: pandora.user.ui.videoMuted,
out: pandora.user.ui.videoPoints[pandora.user.ui.item].out,
position: pandora.user.ui.videoPoints[pandora.user.ui.item].position,
posterFrame: parseInt(video.duration / 2),
showAnnotations: pandora.user.ui.showAnnotations,
showLargeTimeline: true,
@ -363,6 +395,16 @@ pandora.ui.item = function() {
videoSize: pandora.user.ui.videoSize,
width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1
}).bindEvent({
points: function(data) {
pandora.UI.set('videoPoints|' + pandora.user.ui.item, {
'in': data['in'],
out: data.out,
position: pandora.user.ui.videoPoints[pandora.user.ui.item].position
});
},
position: function(data) {
pandora.UI.set('videoPoints|' + pandora.user.ui.item + '|position', data.position);
},
resize: function(event, data) {
pandora.$ui.editor.options({
height: data
@ -412,13 +454,15 @@ pandora.ui.item = function() {
width: data - pandora.$ui.timelinePanel.size(1) - 1
});
});
*/
*/
} else if (pandora.user.ui.itemView == 'files') {
pandora.$ui.contentPanel.replaceElement(1,
pandora.$ui.item = Ox.FilesView({
id: result.data.id
})
);
} else if (pandora.user.ui.itemView == 'frames' || pandora.user.ui.itemView == 'posters') {
pandora.$ui.contentPanel.replaceElement(1,
pandora.$ui.item = pandora.ui.mediaView().bindEvent({
@ -428,11 +472,15 @@ pandora.ui.item = function() {
})
);
}
if (result.data) {
var director = result.data.director ? ' ('+result.data.director.join(', ') + ')' : '';
pandora.$ui.total.html(result.data.title + director);
}
});
return that;
};

22
static/js/pandora/ui/list.js
View file

@ -137,7 +137,7 @@ pandora.ui.list = function() { // fixme: remove view argument
pandora.URL.push(pandora.Query.toString());
}
});
} else if (view == 'icons') {
} else if (view == 'grid') {
//alert(JSON.stringify(pandora.user.ui.lists[pandora.user.ui.list].selected))
that = Ox.IconList({
borderRadius: pandora.user.ui.icons == 'posters' ? 0 : 16,
@ -268,8 +268,13 @@ pandora.ui.list = function() { // fixme: remove view argument
open: function(data) {
var id = data.ids[0],
item = id.split('/')[0],
position = that.value(id, 'in');
pandora.UI.set('videoPosition|' + item, position);
points = {
'in': that.value(id, 'in'),
out: that.value(id, 'out')
};
pandora.UI.set('videoPoints|' + item, Ox.extend(points, {
position: points['in']
}));
pandora.URL.set(item + '/timeline');
},
openpreview: function(data) {
@ -456,8 +461,13 @@ pandora.ui.list = function() { // fixme: remove view argument
open: function(data) {
var id = data.ids[0],
item = pandora.$ui.clips.value(id, 'item'),
position = pandora.$ui.clips.value(id, 'in');
pandora.UI.set('videoPosition|' + item, position);
points = {
'in': pandora.$ui.clips.value(id, 'in'),
out: pandora.$ui.clips.value(id, 'out')
};
pandora.UI.set('videoPoints|' + item, Ox.extend(points, {
position: points['in']
}));
pandora.URL.set(item + '/timeline');
}
}),
@ -517,7 +527,7 @@ pandora.ui.list = function() { // fixme: remove view argument
});
}
if (['list', 'icons'].indexOf(view) > -1) {
if (['list', 'grid'].indexOf(view) > -1) {
pandora.enableDragAndDrop(that, true);

16
static/js/pandora/ui/menu.js
View file

@ -170,7 +170,7 @@ pandora.ui.mainMenu = function() {
change: function(event, data) {
var value = data.checked[0].id;
if (data.id == 'find') {
pandora.$ui.findSelect.selectItem(value);
pandora.$ui.findSelect.options({value: value});
} else if (data.id == 'movieview') {
var id = document.location.pathname.split('/')[1];
if (value == 'info')
@ -192,7 +192,7 @@ pandora.ui.mainMenu = function() {
} else if (data.id == 'sortmovies') {
var operator = pandora.getSortOperator(value);
pandora.$ui.mainMenu.checkItem('sortMenu_ordermovies_' + (operator == '+' ? 'ascending' : 'descending'));
pandora.$ui.sortSelect.selectItem(value);
pandora.$ui.sortSelect.options({value: value});
pandora.$ui.list.options({
sort: [{key: value, operator: operator}]
});
@ -208,20 +208,26 @@ pandora.ui.mainMenu = function() {
pandora.$ui.item.reload();
}
$list = pandora.$ui.browser;
} else if (pandora.user.ui.lists[pandora.user.ui.list].listView == 'icons') {
$list = pandora.$ui.list
} else if (pandora.user.ui.lists[pandora.user.ui.list].listView == 'grid') {
$list = pandora.$ui.list;
}
$list && $list.options({
borderRadius: value == 'posters' ? 0 : pandora.user.ui.item ? 8 : 16,
defaultRatio: value == 'posters' ? 5/8 : 1
}).reloadList(true);
} else if (data.id == 'viewmovies') {
url('#view=' + value);
pandora.UI.set(['lists', pandora.user.ui.list, 'listView'].join('|'), value);
pandora.$ui.viewSelect.options({value: value});
pandora.$ui.contentPanel.replaceElement(1, pandora.$ui.list = pandora.ui.list());
pandora.URL.push('/' + value + '/' + document.location.search);
//pandora.URL.set('/' + value + '/' + document.location.search);
}
},
click: function(event, data) {
if (data.id == 'home') {
pandora.$ui.home = pandora.ui.home().fadeInScreen();
pandora.URL.push('home');
} else if (['about', 'news', 'tour', 'faq', 'tos', 'contact', 'software'].indexOf(data.id) > -1) {
pandora.$ui.siteDialog = pandora.ui.siteDialog(data.id).open();
pandora.URL.push(data.id);

1
static/js/pandora/ui/siteDialog.js
View file

@ -52,6 +52,7 @@ pandora.ui.siteDialog = function(section) {
}).bindEvent({
click: function() {
$dialog.close();
pandora.URL.pushPrevious();
}
})
],

15
static/js/pandora/ui/viewSelect.js
View file

@ -20,16 +20,17 @@ pandora.ui.viewSelect = function() {
margin: '4px 0 0 4px'
})
.bindEvent({
change: !pandora.user.ui.item ? function(event, data) {
var id = data.selected[0].id;
pandora.$ui.mainMenu.checkItem('viewMenu_movies_' + id);
pandora.UI.set(['lists', pandora.user.ui.list, 'listView'].join('|'), id);
change: !pandora.user.ui.item ? function(data) {
var view = data.selected[0].id;
pandora.$ui.mainMenu.checkItem('viewMenu_movies_' + view);
pandora.UI.set(['lists', pandora.user.ui.list, 'listView'].join('|'), view);
pandora.$ui.contentPanel.replaceElement(1, pandora.$ui.list = pandora.ui.list());
pandora.URL.push(pandora.Query.toString());
pandora.URL.push('/' + view + '/' + document.location.search);
// pandora.URL.set('/' + view + '/' + document.location.search);
} : function(event, data) {
var id = data.selected[0].id;
var view = data.selected[0].id;
//pandora.UI.set({itemView: id});
pandora.URL.set(pandora.user.ui.item + '/' + id);
pandora.URL.set(pandora.user.ui.item + '/' + view);
// pandora.$ui.contentPanel.replaceElement(1, pandora.$ui.item = pandora.ui.item());
}
});