From 29e58b9c3ec126c93f21ce2437a3a5db27938d3e Mon Sep 17 00:00:00 2001 From: rolux Date: Tue, 24 May 2011 21:19:27 +0200 Subject: [PATCH] clean up video editor options --- demos/listmap2/js/listmap.js | 2 +- source/Ox.UI/js/Video/Ox.VideoEditor.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/demos/listmap2/js/listmap.js b/demos/listmap2/js/listmap.js index 2a68371d..c6771c4b 100644 --- a/demos/listmap2/js/listmap.js +++ b/demos/listmap2/js/listmap.js @@ -23,7 +23,7 @@ Ox.load('Geo', function() { area = Math.sqrt(city.population * 100), latSize = area / Ox.EARTH_CIRCUMFERENCE * 360, lngSize = area * Ox.getDegreesPerMeter(city.latitude); - return city.population > 100000/*400000*/ ? { + return city.population > 400000/*400000*/ ? { area: city.population * 100, countryCode: countryCode, editable: true, diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js index adf064a8..4eb5ad2c 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditor.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js @@ -18,19 +18,18 @@ Ox.VideoEditor = function(options, self) { cuts: [], duration: 0, find: '', - frameURL: function() {}, fps: 25, getFrameURL: null, getLargeTimelineImageURL: null, getSmallTimelineImageURL: null, 'in': 0, height: 0, - largeTimeline: true, layers: [], out: 0, position: 0, posterFrame: 0, showAnnotations: false, + showLargeTimeline: true, subtitles: [], videoHeight: 0, videoWidth: 0,