diff --git a/pandora/config.pandora.jsonc b/pandora/config.pandora.jsonc index fcde8ab9..1c5cf71b 100644 --- a/pandora/config.pandora.jsonc +++ b/pandora/config.pandora.jsonc @@ -864,8 +864,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "canPlayClips": If true, clips from this layer will play for users with canPlayClips access "entity": ID of the referenced entity (if type is "entity") - "getDefaults": function in pandora namespace that gets called - to populate defaults for new annotations. i.e. getCurrentFrameAnnotation "hasEvents": If true, the calendar will be populated with matches from this layer "hasPlaces": If true, the map will be populated with matches from this diff --git a/pandora/item/models.py b/pandora/item/models.py index 6f7e45b5..3750d3ac 100644 --- a/pandora/item/models.py +++ b/pandora/item/models.py @@ -307,11 +307,6 @@ class Item(models.Model): response = external_data('getData', {'id': self.public_id}) if response['status']['code'] == 200: self.external_data = response['data'] - keys = [ - k['id'] for k in settings.CONFIG['itemKeys'] - ] + settings.ADDITIONAL_IMDB_KEYS - for key in set(self.external_data) - set(keys): - del self.external_data[key] self.save(sync=True) if poster_url != self.prefered_poster_url(): self.remove_poster() diff --git a/pandora/settings.py b/pandora/settings.py index a8e59fed..22229d7d 100644 --- a/pandora/settings.py +++ b/pandora/settings.py @@ -217,11 +217,6 @@ POSTER_PRECEDENCE = () POSTER_ONLY_PORTRAIT = () USE_IMDB = False -ADDITIONAL_IMDB_KEYS = [ - 'cast', - 'links', 'reviews', 'posters', - 'alternativeTitles', 'originalTitle', -] #If you set VIDEO_PREFIX make sure cookies work accros subsomains #by setting SESSION_COOKIE_DOMAIN to ".domain.tld" diff --git a/static/js/editor.js b/static/js/editor.js index 00dddae8..190aac97 100644 --- a/static/js/editor.js +++ b/static/js/editor.js @@ -114,8 +114,7 @@ pandora.ui.editor = function(data) { // async to not capture keyboard input setTimeout(function() { var created = Ox.formatDate(new Date(), '%Y-%m-%dT%H:%M:%SZ'), - layer = Ox.getObjectById(pandora.site.layers, data.layer), - type = layer.type; + type = Ox.getObjectById(pandora.site.layers, data.layer).type; that.addAnnotation(data.layer, Ox.extend( { created: created, @@ -132,8 +131,7 @@ pandora.ui.editor = function(data) { place: {lat: null, lng: null} } : type == 'event' ? { event: {start: '', end: ''} - } : {}, - layer.getDefaults ? pandora[layer.getDefaults](data) : {} + } : {} )); Ox.Request.clearCache(); }); diff --git a/static/js/utils.js b/static/js/utils.js index 60c3db53..30d360cd 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -1274,15 +1274,6 @@ pandora.getClipVideos = function(clip, resolution) { })); }; -pandora.getCurrentFrameAnnotation = function(data) { - var ui = pandora.user.ui, - position = ui.videoPoints[ui.item].position, - resolution = Ox.max(pandora.site.video.resolutions); - return { - value: '\n\n' - }; -}; - (function() { var itemTitles = {}, documentTitles = {}; pandora.getWindowTitle = function(itemData) {