diff -r 8da49ff273e0 -r 4ae2247a59f4 test/integration/allocine_dossier_independant/allocine_test/AcPlayer_v3.0.swf
Binary file test/integration/allocine_dossier_independant/allocine_test/AcPlayer_v3.0.swf has changed
diff -r 8da49ff273e0 -r 4ae2247a59f4 test/integration/allocine_dossier_independant/allocine_test/bamako.json
--- a/test/integration/allocine_dossier_independant/allocine_test/bamako.json Tue Apr 03 20:30:12 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,933 +0,0 @@
-{
- "medias": [
- {
- "id": "cinecast:Bamako",
- "url": "rtmpe://cp41629.edgefcs.net/ondemand/mp4:ondemand/nmedia/cinecast/Bamako1500.m4v",
- "meta": {
- "mediaid": 1,
- "actors": ["Aissa Maiga", "Tiecoura Traore", "Maimouna Helene Diarra"],
- "directors": ["Abderrahmane Sissako"],
- "nationalities": ["FR"],
- "duration": 7080000,
- "productionYear": "2006",
- "synopsis": null,
- "thumbnail": "http://www.vodkaster.com/var/vodkaster/storage/images/films/bamako/42851-1-fre-FR/Bamako3_reference.jpg",
- "title": "Bamako",
- "version": "VOST"
- }
- }
- ],
- "annotation_types": [
- {
- "id": "cinecast:UserAnnotation",
- "meta": {
- "description": "Annotation made during the Cinecast Festival."
- }
- },
- {
- "id": "cinecast:MovieExtract",
- "meta": {
- "description": "Extract from a Movie."
- }
- }
- ],
- "annotations": [
- {
- "id": "ac:3637",
- "begin": 2516000,
- "end": 2516000,
- "timecode": 0,
- "content": {
- "data": "sdfdfdfd"
- },
- "media": "cinecast:Bamako",
- "tags": [],
- "type": "cinecast:UserAnnotation",
- "meta": {
- "mediaid": 1,
- "thumbnail": "/users/02/8/6/4/Z20010705122316617847468/img/1178887619_singe.jpg",
- "extract": "789849",
- "status": "active",
- "timestamp": 12994,
- "created": "2012-03-16T10:01:00.9370000",
- "creator": "ac:3",
- "creator_name": "Pierre",
- "url": "http:\/\/www.allocine.com/"
- }
- }, {
- "id": "ac:3638",
- "begin": 187000,
- "end": 187000,
- "timecode": 0,
- "content": {
- "data": "test #vodkaster #allocine #universcine"
- },
- "media": "cinecast:Bamako",
- "tags": ["#vodkaster", "#allocine", "#universcine"],
- "type": "cinecast:UserAnnotation",
- "meta": {
- "mediaid": 1,
- "thumbnail": "/users/02/7/7/4/Z20110103142031450307477/img/0tyw3myh.cce.jpg",
- "extract": "789849",
- "status": "active",
- "timestamp": 12995,
- "created": "2012-03-16T11:06:47.3170000",
- "creator": "ac:495",
- "creator_name": "Paul",
- "url": "http:\/\/www.allocine.com/"
- }
- }, {
- "id": "ac:3639",
- "begin": 164000,
- "end": 164000,
- "timecode": 0,
- "content": {
- "data": "edtgefvtdtevd dhevdgvbed debzdgbyezgbdyhebzyd bhd ehdbyhebyhddbhegzvdgevd ghdvegvdgezvdg devtgdvgezvd gbvdgevzgdvzegd gedvgezvd #vodkaster #allocine #universcine"
- },
- "media": "cinecast:Bamako",
- "tags": ["#vodkaster", "#allocine", "#universcine"],
- "type": "cinecast:UserAnnotation",
- "meta": {
- "mediaid": 1,
- "thumbnail": "/users/02/7/7/4/Z20110103142031450307477/img/0tyw3myh.cce.jpg",
- "extract": "789849",
- "status": "active",
- "timestamp": 12999,
- "created": "2012-03-16T11:14:14.7930000",
- "creator": "ac:495",
- "creator_name": "Paul",
- "url": "http:\/\/www.allocine.com/"
- }
- }, {
- "id": "ac:3640",
- "begin": 154000,
- "end": 154000,
- "timecode": 0,
- "content": {
- "data": "tegvdge"
- },
- "media": "cinecast:Bamako",
- "tags": [],
- "type": "cinecast:UserAnnotation",
- "meta": {
- "mediaid": 1,
- "thumbnail": "/users/02/7/7/4/Z20110103142031450307477/img/0tyw3myh.cce.jpg",
- "extract": "789849",
- "status": "active",
- "timestamp": 13003,
- "created": "2012-03-16T11:14:30.0930000",
- "creator": "ac:495",
- "creator_name": "Paul",
- "url": "http:\/\/www.allocine.com/"
- }
- }, {
- "id": "ac:3641",
- "begin": 177000,
- "end": 177000,
- "timecode": 0,
- "content": {
- "data": "test #vodkaster"
- },
- "media": "cinecast:Bamako",
- "tags": ["#vodkaster"],
- "type": "cinecast:UserAnnotation",
- "meta": {
- "mediaid": 1,
- "thumbnail": "/users/02/7/7/4/Z20110103142031450307477/img/0tyw3myh.cce.jpg",
- "extract": "789849",
- "status": "active",
- "timestamp": 13004,
- "created": "2012-03-16T11:27:56.9200000",
- "creator": "ac:495",
- "creator_name": "Paul",
- "url": "http:\/\/www.allocine.com/"
- }
- }, {
- "id": "ac:3642",
- "begin": 434000,
- "end": 434000,
- "timecode": 0,
- "content": {
- "data": "fgsdkjfgfsdkjgfkjgfjksdgjkkjgfkjsg"
- },
- "media": "cinecast:Bamako",
- "tags": [],
- "type": "cinecast:UserAnnotation",
- "meta": {
- "mediaid": 1,
- "thumbnail": "/users/02/5/4/4/Z20101124101755407924445/img/02kehkqh.re1.jpg",
- "extract": "789849",
- "status": "active",
- "timestamp": 13006,
- "created": "2012-03-16T11:49:33.0770000",
- "creator": "ac:513",
- "creator_name": "Jacques",
- "url": "http:\/\/www.allocine.com/"
- }
- }, {
- "id": "ac:3643",
- "begin": 177000,
- "end": 177000,
- "timecode": 0,
- "content": {
- "data": "tetsd dgzydg"
- },
- "media": "cinecast:Bamako",
- "tags": [],
- "type": "cinecast:UserAnnotation",
- "meta": {
- "mediaid": 1,
- "thumbnail": "/users/02/8/6/4/Z20010705122316617847468/img/1178887619_singe.jpg",
- "extract": "789849",
- "status": "active",
- "timestamp": 13007,
- "created": "2012-03-16T12:50:38.3100000",
- "creator": "ac:3",
- "creator_name": "Pierre",
- "url": "http:\/\/www.allocine.com/"
- }
- }, {
- "id": "ac:3644",
- "begin": 177000,
- "end": 177000,
- "timecode": 0,
- "content": {
- "data": "coucou"
- },
- "media": "cinecast:Bamako",
- "tags": [],
- "type": "cinecast:UserAnnotation",
- "meta": {
- "mediaid": 1,
- "thumbnail": "/users/02/4/2/5/Z20090108105245410444524/img/io54r5is.0qi.jpg",
- "extract": "789849",
- "status": "active",
- "timestamp": 13008,
- "created": "2012-03-16T13:37:48.3600000",
- "creator": "ac:382",
- "creator_name": "Martin",
- "url": "http:\/\/www.allocine.com/"
- }
- }, {
- "id": "ac:10806",
- "begin": 120000,
- "end": 120000,
- "timecode": 0,
- "content": {
- "data": "tetzfdtfzd"
- },
- "media": "cinecast:Bamako",
- "tags": [],
- "type": "cinecast:UserAnnotation",
- "meta": {
- "mediaid": 1,
- "thumbnail": "/users/02/7/7/4/Z20110103142031450307477/img/0tyw3myh.cce.jpg",
- "extract": "789849",
- "status": "active",
- "timestamp": 20201,
- "created": "2012-03-19T14:26:17.4870000",
- "creator": "ac:495",
- "creator_name": "Paul",
- "url": "http:\/\/www.allocine.com/"
- }
- }, {
- "id": "cinecast:789808",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34952\/25592345-4-fre-FR\/34952-Generique-de-debut-et-preparation-a-l-audience1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 0,
- "end": 180000,
- "content": {
- "data": "G\u00e9n\u00e9rique de d\u00e9but et pr\u00e9paration \u00e0 l'audience"
- }
- }, {
- "id": "cinecast:789812",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34953\/25592424-3-fre-FR\/34953-Debut-de-l-audience1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 180000,
- "end": 284000,
- "content": {
- "data": "D\u00e9but de l'audience"
- }
- }, {
- "id": "cinecast:789816",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34954\/25592478-3-fre-FR\/34954-Fin-du-spectacle-et-reprise-de-l-audience1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 404000,
- "end": 579000,
- "content": {
- "data": "Fin du spectacle et reprise de l'audience"
- }
- }, {
- "id": "cinecast:789818",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34955\/25592528-3-fre-FR\/34955-Corruption-et-seduction1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 579000,
- "end": 676000,
- "content": {
- "data": "Corruption et s\u00e9duction"
- }
- }, {
- "id": "cinecast:789820",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34956\/25592566-2-fre-FR\/34956-Des-chiffres-africains-calamiteux1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 676000,
- "end": 797000,
- "content": {
- "data": "Des chiffres africains calamiteux"
- }
- }, {
- "id": "cinecast:789822",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34957\/25592606-2-fre-FR\/34957-un-ideal-de-societe-inadaptee1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 797000,
- "end": 977000,
- "content": {
- "data": "un id\u00e9al de soci\u00e9t\u00e9 inadapt\u00e9e"
- }
- }, {
- "id": "cinecast:789824",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34958\/25592668-2-fre-FR\/34958-Supercherie-du-G81_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 977000,
- "end": 1143000,
- "content": {
- "data": "\"Supercherie\" du G8 ?"
- }
- }, {
- "id": "cinecast:789825",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34959\/25592703-2-fre-FR\/34959-C-est-un-debat-qui-depasse-l-Afrique1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 1143000,
- "end": 1276000,
- "content": {
- "data": "C'est un d\u00e9bat qui d\u00e9passe l'Afrique"
- }
- }, {
- "id": "cinecast:789839",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34960\/25592937-2-fre-FR\/34960-Ce-monde-est-ouvert-aux-blancs-mais-pas-aux-noirs1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 1276000,
- "end": 1456000,
- "content": {
- "data": "Ce monde est ouvert aux blancs mais pas aux noirs"
- }
- }, {
- "id": "cinecast:789849",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34961\/25593042-2-fre-FR\/34961-Standby1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 1456000,
- "end": 1590000,
- "content": {
- "data": "Standby"
- }
- }, {
- "id": "cinecast:789854",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34963\/25593121-2-fre-FR\/34963-Expose-du-periple1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 1590000,
- "end": 1761000,
- "content": {
- "data": "Expos\u00e9 du p\u00e9riple"
- }
- }, {
- "id": "cinecast:789874",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34967\/25593375-2-fre-FR\/34967-Expose-du-periple-21_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 1761000,
- "end": 1901000,
- "content": {
- "data": "Expos\u00e9 du p\u00e9riple 2"
- }
- }, {
- "id": "cinecast:789878",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34968\/25593421-2-fre-FR\/34968-L-audience-est-suspendue1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 1901000,
- "end": 2081000,
- "content": {
- "data": "L'audience est suspendue"
- }
- }, {
- "id": "cinecast:789880",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34969\/25593461-2-fre-FR\/34969-Activites-et-problemes-du-soir1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 2081000,
- "end": 2134000,
- "content": {
- "data": "Activit\u00e9s et probl\u00e8mes du soir"
- }
- }, {
- "id": "cinecast:789884",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34970\/25593533-4-fre-FR\/34970-Death-in-Tumbuktu-11_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 2134000,
- "end": 2301000,
- "content": {
- "data": "Death in Tumbuktu 1"
- }
- }, {
- "id": "cinecast:789888",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34971\/25593579-2-fre-FR\/34971-Death-in-Tumbuktu-21_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 2301000,
- "end": 2457000,
- "content": {
- "data": "Death in Tumbuktu 2"
- }
- }, {
- "id": "cinecast:789891",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34972\/25593626-3-fre-FR\/34972-Une-vie-et-un-couple-precaires1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 2457000,
- "end": 2624000,
- "content": {
- "data": "Une vie et un couple pr\u00e9caires"
- }
- }, {
- "id": "cinecast:789896",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34973\/25593677-3-fre-FR\/34973-Un-mariage-interrompt-l-audience1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 2624000,
- "end": 2763000,
- "content": {
- "data": "Un mariage interrompt l'audience"
- }
- }, {
- "id": "cinecast:789901",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34974\/25593734-2-fre-FR\/34974-L-Afrique-n-a-t-elle-plus-aucun-moyen-financier1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 2763000,
- "end": 2903000,
- "content": {
- "data": "L'Afrique n'a-t-elle plus aucun moyen financier ?"
- }
- }, {
- "id": "cinecast:789904",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34975\/25593779-2-fre-FR\/34975-BM-ET-FMI-les-seuls-coupables1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 2903000,
- "end": 3056000,
- "content": {
- "data": "BM ET FMI : les seuls coupables ?"
- }
- }, {
- "id": "cinecast:789906",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34976\/25593821-2-fre-FR\/34976-Reflexion-sur-le-role-des-banques1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 3056000,
- "end": 3110000,
- "content": {
- "data": "R\u00e9flexion sur le r\u00f4le des banques"
- }
- }, {
- "id": "cinecast:789911",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34978\/25593906-2-fre-FR\/34978-Absence-d-ambassade-d-Israel-preuve-de-l-anti-developpement1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 3110000,
- "end": 3202000,
- "content": {
- "data": "Absence d'ambassade d'Isra\u00ebl = preuve de l'anti-d\u00e9veloppement ?"
- }
- }, {
- "id": "cinecast:789914",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34979\/25593951-2-fre-FR\/34979-Colonialisme-latent1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 3202000,
- "end": 3359000,
- "content": {
- "data": "Colonialisme latent"
- }
- }, {
- "id": "cinecast:789917",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34981\/25594026-2-fre-FR\/34981-Colonialisme-latent-21_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 3359000,
- "end": 3411000,
- "content": {
- "data": "Colonialisme latent 2"
- }
- }, {
- "id": "cinecast:789919",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34982\/25594093-2-fre-FR\/34982-Colonialisme-latent-31_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 3522000,
- "end": 3573000,
- "content": {
- "data": "Colonialisme latent 3"
- }
- }, {
- "id": "cinecast:789921",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34983\/25594133-2-fre-FR\/34983-Sermon-du-pasteur1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 3573000,
- "end": 3722000,
- "content": {
- "data": "Sermon du pasteur"
- }
- }, {
- "id": "cinecast:789925",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34985\/25594213-2-fre-FR\/34985-Standby-21_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 3722000,
- "end": 3807000,
- "content": {
- "data": "Standby 2"
- }
- }, {
- "id": "cinecast:789927",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34986\/25594280-2-fre-FR\/34986-Samba-Diakite1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 3807000,
- "end": 3981000,
- "content": {
- "data": "Samba Diakit\u00e9"
- }
- }, {
- "id": "cinecast:789928",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34987\/25594315-2-fre-FR\/34987-Audience-et-contre-audience1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 3981000,
- "end": 4033000,
- "content": {
- "data": "Audience et contre-audience"
- }
- }, {
- "id": "cinecast:789929",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34988\/25594350-3-fre-FR\/34988-Theorie-du-complot1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 4033000,
- "end": 4197000,
- "content": {
- "data": "Th\u00e9orie du complot"
- }
- }, {
- "id": "cinecast:789931",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34989\/25594417-3-fre-FR\/34989-Reponse-a-la-theorie-du-complot1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 4197000,
- "end": 4358000,
- "content": {
- "data": "R\u00e9ponse \u00e0 la th\u00e9orie du complot"
- }
- }, {
- "id": "cinecast:789933",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34990\/25594484-2-fre-FR\/34990-Recit-d-un-reve1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 4358000,
- "end": 4443000,
- "content": {
- "data": "R\u00e9cit d'un r\u00eave"
- }
- }, {
- "id": "cinecast:789934",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34991\/25594519-2-fre-FR\/34991-Aucune-preuve-qui-soutienne-la-theorie-du-complot1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 4443000,
- "end": 4545000,
- "content": {
- "data": "Aucune preuve qui soutienne la th\u00e9orie du complot"
- }
- }, {
- "id": "cinecast:789940",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34992\/25594575-2-fre-FR\/34992-Triste-soiree1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 4545000,
- "end": 4620000,
- "content": {
- "data": "Triste soir\u00e9e"
- }
- }, {
- "id": "cinecast:789941",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34993\/25594610-2-fre-FR\/34993-Le-tissu-social-est-il-detruit1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 4620000,
- "end": 4729000,
- "content": {
- "data": "Le tissu social est-il d\u00e9truit ?"
- }
- }, {
- "id": "cinecast:789945",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/34994\/25594660-2-fre-FR\/34994-Plaidoirie-de-Maitre-Rappaport1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 4729000,
- "end": 4908000,
- "content": {
- "data": "Plaidoirie de Ma\u00eetre Rappaport"
- }
- }, {
- "id": "cinecast:790160",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/35018\/25597011-3-fre-FR\/35018-Plaidoirie-de-Maitre-Rappaport-21_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 4908000,
- "end": 5081000,
- "content": {
- "data": "Plaidoirie de Ma\u00eetre Rappaport 2"
- }
- }, {
- "id": "cinecast:790173",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/35020\/25597155-2-fre-FR\/35020-Chanter-pour-se-faire-entendre1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 5082000,
- "end": 5262000,
- "content": {
- "data": "Chanter pour se faire entendre"
- }
- }, {
- "id": "cinecast:790194",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/35021\/25597543-3-fre-FR\/35021-Plaidoirie-de-Maitre-William-Bourdon1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 5262000,
- "end": 5434000,
- "content": {
- "data": "Plaidoirie de Ma\u00eetre William Bourdon"
- }
- }, {
- "id": "cinecast:790201",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/35022\/25597618-3-fre-FR\/35022-Plaidoirie-de-Maitre-William-Bourdon-21_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 5434000,
- "end": 5588000,
- "content": {
- "data": "Plaidoirie de Ma\u00eetre William Bourdon 2"
- }
- }, {
- "id": "cinecast:790207",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/35023\/25597704-3-fre-FR\/35023-Plaidoirie-de-Wiliam-Bourdon-41_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 5768000,
- "end": 5824000,
- "content": {
- "data": "Plaidoirie de Wiliam Bourdon 4"
- }
- }, {
- "id": "cinecast:790210",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/35024\/25597774-3-fre-FR\/35024-Plaidoirie-de-Aissata-Tall-Sall1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 5824000,
- "end": 5985000,
- "content": {
- "data": "Plaidoirie de A\u00efssata Tall Sall"
- }
- }, {
- "id": "cinecast:790212",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/35025\/25597812-3-fre-FR\/35025-Plaidoirie-de-Aissata-Tall-Sall-21_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 5985000,
- "end": 6081000,
- "content": {
- "data": "Plaidoirie de A\u00efssata Tall Sall 2"
- }
- }, {
- "id": "cinecast:790215",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/35026\/25597857-3-fre-FR\/35026-Interlude-musical1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 6081000,
- "end": 6245000,
- "content": {
- "data": "Interlude musical"
- }
- }, {
- "id": "cinecast:790217",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/35027\/25597895-2-fre-FR\/35027-SPOILER-Suicide1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 6245000,
- "end": 6311000,
- "content": {
- "data": "SPOILER - Suicide"
- }
- }, {
- "id": "cinecast:790218",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/35028\/25597930-2-fre-FR\/35028-Funerailles1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 6311000,
- "end": 6430000,
- "content": {
- "data": "Fun\u00e9railles"
- }
- }, {
- "id": "cinecast:790219",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/35029\/25597965-2-fre-FR\/35029-Documentaire-sur-les-funerailles1_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 6430000,
- "end": 6539000,
- "content": {
- "data": "Documentaire sur les fun\u00e9railles"
- }
- }, {
- "id": "cinecast:790220",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/35030\/25598000-2-fre-FR\/35030-Generique-de-fin-11_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 6539000,
- "end": 6659000,
- "content": {
- "data": "G\u00e9n\u00e9rique de fin 1"
- }
- }, {
- "id": "cinecast:790221",
- "type": "cinecast:MovieExtract",
- "media": "cinecast:Bamako",
- "meta": {
- "thumbnail": "http:\/\/www.vodkaster.com\/var\/vodkaster\/storage\/images\/films\/bamako\/35031\/25598035-2-fre-FR\/35031-Generique-de-fin-21_reference.jpg",
- "creator": "Vodkaster",
- "created": "1970-01-01T01:00:00+01:00"
- },
- "begin": 6659000,
- "end": 6725000,
- "content": {
- "data": "G\u00e9n\u00e9rique de fin 2"
- }
- }
- ],
- "meta": {
- "id": "cinecast:Bamako",
- "created": "2012-03-19T17:15:22.4921496Z",
- "creator": "AlloCine"
- },
- "format": "http://advene.org/ns/cinelab/",
- "imports": [
- {
- "id": "cinecast",
- "url": "http://cinecast.fr/festival/configuration.json"
- }
- ]
-}
\ No newline at end of file
diff -r 8da49ff273e0 -r 4ae2247a59f4 test/integration/allocine_dossier_independant/allocine_test/data_cinecast.xml
--- a/test/integration/allocine_dossier_independant/allocine_test/data_cinecast.xml Tue Apr 03 20:30:12 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Publicité : votre vidéo commence dans | secondes]]>
-
-
-
-
\ No newline at end of file
diff -r 8da49ff273e0 -r 4ae2247a59f4 test/integration/allocine_dossier_independant/css/LdtPlayer.css
--- a/test/integration/allocine_dossier_independant/css/LdtPlayer.css Tue Apr 03 20:30:12 2012 +0200
+++ b/test/integration/allocine_dossier_independant/css/LdtPlayer.css Fri Apr 06 16:49:32 2012 +0200
@@ -144,212 +144,11 @@
height:0px;
display:none
}
-
-/* player */
-.Ldt-controler {
- font-size: 10px;
- background:url('img-cinecast/controlbarbgd.png') repeat-x transparent ;
- height: 34px;
-}
-
-.Ldt-LeftPlayerControls {
- float:left;
-}
-
-.Ldt-RightPlayerControls {
- float: right;
-}
-
-.Ldt-Ctrl-button {
- float: left;
- width: 30px; height: 25px;
- background: url('img-cinecast/player-sprites.png');
- cursor: pointer;
-}
-
-.Ldt-Ctrl-spacer {
- float: left; width: 2px; background: url(img-cinecast/controlbarspacer.png); height: 34px;
-}
-
-.Ldt-CtrlPlay {
- margin: 4px 15px;
-}
-
-.Ldt-CtrlPlay-PlayState {
- background-position: 0 0;
-}
-
-.Ldt-CtrlPlay-PlayState:hover {
- background-position: 0 -25px;
-}
-
-.Ldt-CtrlPlay-PlayState:active {
- background-position: 0 -50px;
-}
-
-.Ldt-CtrlPlay-PauseState {
- background-position: -30px 0;
-}
-
-.Ldt-CtrlPlay-PauseState:hover {
- background-position: -30px -25px;
-}
-
-.Ldt-CtrlPlay-PauseState:active {
- background-position: -30px -50px;
-}
-
-
-.Ldt-CtrlAnnotate {
- margin: 4px 2px;
- background-position: -60px 0;
-}
-
-.Ldt-CtrlAnnotate:hover {
- background-position: -60px -25px;
-}
-
-.Ldt-CtrlAnnotate:active {
- background-position: -60px -50px;
-}
-
-.Ldt-CtrlSearch {
- margin: 4px 2px;
- background-position: -90px 0;
-}
-
-.Ldt-CtrlSearch:hover {
- background-position: -90px -25px;
-}
-
-.Ldt-CtrlSearch:active {
- background-position: -90px -50px;
-}
-
-.LdtSearch {
- display: none;
- width: 165px;
- height: 25px;
- border: 1px;
- border-color: #CFCFCF;
- float: left;
- text-align: center;
-}
-
-.Ldt-Time {
- float: left;
- margin: 8px 5px;
- font-size: 12px;
- font-family: Arial, Verdana, sans-serif;
- color: #ffffff;
-}
-
-.Ldt-ElapsedTime {
- float: left;
-}
-
-.Ldt-TimeSeparator {
- margin: 0 4px;
- float: left;
-}
-
-.Ldt-TotalTime {
- float: left;
-}
-
-.Ldt-CtrlSound {
- margin: 4px 2px;
-}
-
-.Ldt-CtrlSound-Full {
- background-position: -120px 0;
-}
-
-.Ldt-CtrlSound-Full:hover {
- background-position: -120px -25px;
-}
-
-.Ldt-CtrlSound-Full:active {
- background-position: -120px -50px;
-}
-
-.Ldt-CtrlSound-Mute {
- background-position: -150px 0;
-}
-
-.Ldt-CtrlSound-Mute:hover {
- background-position: -150px -25px;
-}
-
-.Ldt-CtrlSound-Mute:active {
- background-position: -150px -50px;
-}
-
-.Ldt-CtrlSound-Half {
- background-position: -180px 0;
-}
-
-.Ldt-CtrlSound-Half:hover {
- background-position: -180px -25px;
-}
-
-.Ldt-CtrlSound-Half:active {
- background-position: -180px -50px;
-}
-
-.Ldt-Ctrl-Volume-Control {
- display: none;
- position: absolute;
- background:url('img-cinecast/controlbarbgd.png') repeat-x transparent ;
- height: 34px;
- width: 100px; top: 30px; right: 0; z-index: 100;
- padding: 0 2px;
-}
-
-.Ldt-Ctrl-Volume-Bar {
- height: 5px; margin: 13px 3px 0; background: #cccccc; border: 1px solid #999999; border-radius: 2px;
-}
-
-.Ldt-Ctrl-Volume-Cursor {
- position: absolute; top: 6px; width: 6px; height: 19px; background: #a8a8a8; border: 1px solid #999999; border-radius: 2px;
- cursor: pointer;
-}
-
-.Ldt-Ctrl-Volume-Cursor:hover {
- background: #cccccc;
-}
-
-.Ldt-Ctrl-Volume-Cursor.ui-draggable-dragging {
- background: #999999;
-}
.Ldt-cleaner {
clear:both;
}
-/* Arrow Widget */
-.Ldt-arrowWidget {
- position: relative;
-
- height:16px;
- width:27px;
- margin-bottom: -3px;
- z-index: 4;
- left: 0%;
-}
-
-.Ldt-arrowLeftEdge {
- background:url('imgs/left_edge_arrow.png') no-repeat scroll 0 0 transparent ;
-}
-
-.Ldt-arrowCenter {
- background:url('imgs/arrow.png') no-repeat scroll 0 0 transparent ;
-}
-
-.Ldt-arrowRightEdge {
- background:url('imgs/right_edge_arrow.png') no-repeat scroll 0 0 transparent ;
-}
-
.cleaner {
clear:both;
}
@@ -407,53 +206,7 @@
max-width: 140px; max-height: 70px; margin: 0 20px;
}
-/* slider */
-.Ldt-SliderMinimized {
- height: 6px;
-}
-.Ldt-SliderMaximized {
- height: 11px;
-}
-
-.Ldt-sliderElementMinimized {
- width: 100%;
- height: 5px;
-}
-
-.Ldt-sliderElementMaximized {
- width: 100%;
- height: 10px;
-}
-
-.Ldt-sliderBackground {
- background-color: #333333;
- position: absolute;
- z-index: 2;
- bottom: 1px;
- width: 100%;
- height: 5px;
-
-}
-
-.Ldt-sliderForeground {
- background-color: #747474;
- z-index: 2;
- width: 0px;
- position: absolute;
- bottom: 1px;
- height: 5px;
-}
-
-.Ldt-sliderPositionMarker {
- position: absolute;
- z-index: 100;
- background: url('img-cinecast/sliderpos.png');
- height: 10px !important;
- width: 10px !important;
- bottom: 0;
- cursor: pointer;
-}
/* sparkline widget */
.Ldt-sparklineWidget {
@@ -677,7 +430,6 @@
}
.Ldt-AnnotationsList-li {
- cursor: pointer;
float: left; width: 100%; clear: both;
margin: 2px 0; padding: 2px 0;
position: relative;
@@ -693,6 +445,10 @@
text-decoration: none;
}
+.Ldt-AnnotationsListWidget a:hover {
+ text-decoration: underline;
+}
+
.Ldt-AnnotationsList-Thumbnail {
border: none;
float: left;
@@ -712,17 +468,18 @@
.Ldt-AnnotationsList-Title {
font-size: 13px;
margin: 0 0 2px 80px;
-}
-
-.Ldt-AnnotationsList-Title a {
color: #ffffff;
}
+
.Ldt-AnnotationsList-Description {
- color: #dddddd;
font-style: italic;
margin: 0 0 2px 80px;
}
+.Ldt-AnnotationsList-Description a {
+ color: #dddddd;
+}
+
.Ldt-AnnotationsList-Tags {
float: left; clear: both; padding: 0; margin: 2px 0 0 80px; list-style: none;
}
@@ -741,7 +498,7 @@
}
.Ldt-createAnnotation-moar-keywordz {
- float: right; font-size: 13px; color: #ffffff; text-shadow: 1px 1px 1px #000000;
+ float: right; font-size: 13px; color: #ffffff; text-shadow: 1px 1px 1px #000000; cursor: pointer;
width: 140px; height: 23px; background: url(img-cinecast/moar.png); border: none; margin: 0 15px;
}
diff -r 8da49ff273e0 -r 4ae2247a59f4 test/integration/allocine_dossier_independant/js/LdtPlayer-release.js
--- a/test/integration/allocine_dossier_independant/js/LdtPlayer-release.js Tue Apr 03 20:30:12 2012 +0200
+++ b/test/integration/allocine_dossier_independant/js/LdtPlayer-release.js Fri Apr 06 16:49:32 2012 +0200
@@ -996,7 +996,7 @@
"'")+",'"}).replace(d.evaluate||null,function(a,b){return"');"+b.replace(/\\'/g,"'").replace(/[\r\n\t]/g," ")+";__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');",e=new Function("obj","_",d);return c?e(c,b):function(a){return e.call(this,a,b)}};var n=function(a){this._wrapped=a};b.prototype=n.prototype;var u=function(a,c){return c?b(a).chain():a},J=function(a,c){n.prototype[a]=function(){var a=i.call(arguments);H.call(a,this._wrapped);return u(c.apply(b,
a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];n.prototype[a]=function(){b.apply(this._wrapped,arguments);return u(this._wrapped,this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];n.prototype[a]=function(){return u(b.apply(this._wrapped,arguments),this._chain)}});n.prototype.chain=function(){this._chain=true;return this};n.prototype.value=function(){return this._wrapped}}).call(this);
/* main file */
-
+// Why is it called main ? It only loads the libs !
if ( window.IriSP === undefined && window.__IriSP === undefined ) {
/**
@@ -1016,23 +1016,39 @@
IriSP._ = window._.noConflict();
IriSP.underscore = IriSP._;
-IriSP.loadLibs = function( libs, config, metadata_url, callback ) {
+IriSP.getLib = function(lib) {
+ return (
+ IriSP.libFiles.useCdn && typeof IriSP.libFiles.cdn[lib] == "string"
+ ? IriSP.libFiles.cdn[lib]
+ : (
+ typeof IriSP.libFiles.locations[lib] == "string"
+ ? IriSP.libFiles.locations[lib]
+ : (
+ typeof IriSP.libFiles.inDefaultDir[lib] == "string"
+ ? IriSP.libFiles.defaultDir + IriSP.libFiles.inDefaultDir[lib]
+ : null
+ )
+ )
+ )
+}
+
+IriSP.loadLibs = function( config, metadata_url, callback ) {
// Localize jQuery variable
IriSP.jQuery = null;
- var $L = $LAB.script(libs.jQuery).script(libs.swfObject).wait()
- .script(libs.jQueryUI);
+ var $L = $LAB.script(IriSP.getLib("jQuery")).script(IriSP.getLib("swfObject")).wait()
+ .script(IriSP.getLib("jQueryUI"));
if (config.player.type === "jwplayer" || config.player.type === "allocine") {
// load our popcorn.js lookalike
- $L.script(libs.jwplayer);
+ $L.script(IriSP.getLib("jwplayer"));
} else {
// load the real popcorn
- $L.script(libs.popcorn).script(libs["popcorn.code"]);
+ $L.script(IriSP.getLib("popcorn")).script(IriSP.getLib("popcorn.code"));
if (config.player.type === "youtube") {
- $L.script(libs["popcorn.youtube"]);
+ $L.script(IriSP.getLib("popcorn.youtube"));
}
if (config.player.type === "vimeo")
- $L.script(libs["popcorn.vimeo"]);
+ $L.script(IriSP.getLib("popcorn.vimeo"));
/* do nothing for html5 */
}
@@ -1042,10 +1058,10 @@
if (config.gui.widgets[idx].type === "PolemicWidget" ||
config.gui.widgets[idx].type === "StackGraphWidget" ||
config.gui.widgets[idx].type === "SparklineWidget") {
- $L.script(libs.raphael);
+ $L.script(IriSP.getLib("raphael"));
}
if (config.gui.widgets[idx].type === "TraceWidget") {
- $L.script(libs.tracemanager)
+ $L.script(IriSP.getLib("tracemanager"))
}
}
@@ -1053,7 +1069,7 @@
/*
for (var idx in config.modules) {
if (config.modules[idx].type === "PolemicWidget")
- $L.script(libs.raphaelJs);
+ $L.script(IriSP.getLib("raphaelJs"));
}
*/
@@ -1063,7 +1079,7 @@
var css_link_jquery = IriSP.jQuery( "
", {
rel: "stylesheet",
type: "text/css",
- href: libs.cssjQueryUI,
+ href: IriSP.getLib("cssjQueryUI"),
'class': "dynamic_css"
} );
var css_link_custom = IriSP.jQuery( "
", {
@@ -1089,9 +1105,9 @@
IriSP.annotation_template = "{{! template for an annotation displayed in a segmentWidget }}
";
IriSP.annotationWidget_template = "{{! template for the annotation widget }}
";
IriSP.annotation_loading_template = "{{! template shown while the annotation widget is loading }}
";
-IriSP.annotationsListWidget_template = "{{! template for the annotation list widget }}
";
+IriSP.annotationsListWidget_template = "{{! template for the annotation list widget }}
";
IriSP.arrowWidget_template = "
";
-IriSP.createAnnotationWidget_template = "{{! template for the annotation creation widget }}
";
+IriSP.createAnnotationWidget_template = "{{! template for the annotation creation widget }}
";
IriSP.createAnnotation_errorMessage_template = "
{{l10n.empty_annotation}}
";
IriSP.loading_template = "
{{l10n.loading_wait}}
";
IriSP.overlay_marker_template = "{{! the template for the small bars which is z-indexed over our segment widget }}
";
@@ -1556,15 +1572,16 @@
this._callbacks = {};
};
-IriSP.DataLoader.prototype.get = function(url, callback) {
-
- var base_url = url.split("&")[0]
+IriSP.DataLoader.prototype.get = function(url, callback, force_reload) {
+ var base_url = url.split("&")[0];
+ if (typeof force_reload != "undefined" && force_reload && this._cache.hasOwnProperty(base_url)) {
+ delete this._cache[base_url]
+ }
if (this._cache.hasOwnProperty(base_url)) {
callback(this._cache[base_url]);
} else {
if (!this._callbacks.hasOwnProperty(base_url)) {
- this._callbacks[base_url] = [];
- this._callbacks[base_url].push(callback);
+ this._callbacks[base_url] = [callback];
/* we need a closure because this gets lost when it's called back */
// uncomment you don't want to use caching.
@@ -1577,6 +1594,7 @@
for (i = 0; i < this._callbacks[base_url].length; i++) {
this._callbacks[base_url][i](this._cache[base_url]);
}
+ delete this._callbacks[base_url];
};
/* automagically choose between json and jsonp */
@@ -1614,8 +1632,11 @@
IriSP.Serializer.prototype.currentMedia = function() {
};
-IriSP.Serializer.prototype.sync = function(callback) {
- callback.call(this, this._data);
+IriSP.Serializer.prototype.getDuration = function() {
+};
+
+IriSP.Serializer.prototype.sync = function(callback) {
+ this._DataLoader.get(this._url, callback, force_refresh);
};
IriSP.SerializerFactory = function(DataLoader) {
@@ -1648,157 +1669,145 @@
return undefined;
}
};
-/* site.js - all our site-dependent config : player chrome, cdn locations, etc...*/
-
-IriSP.defaults = {};
-
-/* these objects are filled by configureDefaults. The function doesn't overwrite
- defaults that were originally defined by the user.
-*/
-IriSP.lib = {};
-
-/* We need to define those so that the individual settings can be overwritten */
-IriSP.widgetsDefaults = {};
-
-IriSP.paths = {};
-
-IriSP.libdir = "/metadataplayer/src/js/libs/";
-IriSP.jwplayer_swf_path = "../test/libs/player.swf";
-IriSP.platform_url = "http://192.168.56.101/pf";
-IriSP.default_templates_vars = { };
-
-IriSP.language = 'fr';
-
-/** ugly ugly ugly ugly - returns an object defining
- the paths to the libs
- We need it that way cause it's called at runtime by
- IriSP.configureDefaults.
-*/
-IriSP.defaults.lib = function(libdir) {
- if (IriSP.null_or_undefined(libdir))
- libdir = IriSP.libdir;
-
- return {
-// jQuery : "http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.js",
- jQuery : libdir + "jquery.min.js",
-// jQueryUI : "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.17/jquery-ui.js",
- jQueryUI : libdir + "jquery-ui.min.js",
-// jQueryToolTip : "http://cdn.jquerytools.org/1.2.4/all/jquery.tools.min.js",
- jQueryToolTip : libdir + "jquery.tools.min.js",
-// swfObject : "http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js",
- swfObject : libdir + "swfobject.js",
-// cssjQueryUI : "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/base/jquery-ui.css",
- cssjQueryUI : libdir + "jquery-ui.css",
- popcorn : libdir + "popcorn.js",
- jwplayer : libdir + "jwplayer.js",
- popcornReplacement: libdir + "pop.js",
- raphael: libdir + "raphael.js",
- jquery_sparkline: libdir + "jquery.sparkline.js",
- "popcorn.mediafragment" : libdir + "popcorn.mediafragment.js",
- "popcorn.code" : libdir + "popcorn.code.js",
- "popcorn.jwplayer": libdir + "popcorn.jwplayer.js",
- "popcorn.youtube": libdir + "popcorn.youtube.js",
- "tracemanager": libdir + "tracemanager.js"
- };
-};
-
-//Configuration for the player and utility functions.
-// No need to have them configured at runtime
-IriSP.config = {};
-
-IriSP.config.shortener = {
- // function to call to shorten an url.
- //shortening_function : IriSP.platform_shorten_url
-};
-
-IriSP.defaults.widgetsDefaults = function(platform_url) {
- if (IriSP.null_or_undefined(platform_url))
- platform_url = IriSP.platform_url;
-
- return {
- "LayoutManager" : {spacer_div_height : "0px" },
- "PlayerWidget" : {},
- "AnnotationsWidget": {
- "share_text" : "I'm watching ",
- "fb_link" : "http://www.facebook.com/share.php?u=",
- "tw_link" : "http://twitter.com/home?status=",
- "gplus_link" : ""
- },
-
+IriSP.language = 'en';
+
+IriSP.libFiles = {
+ defaultDir : "js/libs/",
+ inDefaultDir : {
+ jQuery : "jquery.min.js",
+ jQueryUI : "jquery-ui.min.js",
+ jQueryToolTip : "jquery.tools.min.js",
+ swfObject : "swfobject.js",
+ cssjQueryUI : "jquery-ui.css",
+ popcorn : "popcorn.js",
+ jwplayer : "jwplayer.js",
+ raphael : "raphael.js",
+ "popcorn.mediafragment" : "popcorn.mediafragment.js",
+ "popcorn.code" : "popcorn.code.js",
+ "popcorn.jwplayer" : "popcorn.jwplayer.js",
+ "popcorn.youtube" : "popcorn.youtube.js",
+ "tracemanager" : "tracemanager.js"
+ },
+ locations : {
+ // use to define locations outside defautl_dir
+ },
+ cdn : {
+ jQueryUI : "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.17/jquery-ui.js",
+ jQueryToolTip : "http://cdn.jquerytools.org/1.2.4/all/jquery.tools.min.js",
+ swfObject : "http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js",
+ cssjQueryUI : "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/base/jquery-ui.css"
+ },
+ useCdn : false
+}
+
+IriSP.widgetsDefaults = {
+ "LayoutManager" : {
+ spacer_div_height : 0
+ },
+ "PlayerWidget" : {
+
+ },
+ "AnnotationsWidget" : {
+ "share_text" : "I'm watching "
+ },
"TweetsWidget" : {
default_profile_picture : "https://si0.twimg.com/sticky/default_profile_images/default_profile_1_normal.png",
- tweet_display_period: 10000 // how long do we show a tweet ?
-
+ tweet_display_period : 10000 // how long do we show a tweet ?
},
"SliderWidget" : {
- minimize_period: 850 // how long does the slider stays maximized after the user leaves the zone ?
+ minimize_period : 850 // how long does the slider stays maximized after the user leaves the zone ?
+ },
+ "SegmentsWidget" : {
+ cinecast_version : false
},
"createAnnotationWidget" : {
- keywords: ["#amateur", "#digital-studies"],
- polemic_mode: true, /* enable polemics ? */
- /* polemics - the corresponding class names defined in the css should be for instance :
- Ldt-createAnnotation-polemic-positive for positive
- Ldt-createAnnotation-polemic-equalequal for equalequal, etc.
- */
- polemics: [ { "className" : "positive", "keyword" : "++" }, { "className" : "negative", "keyword" : "--" }, { "className" : "reference", "keyword" : "==" }, { "className" : "question", "keyword" : "??" } ],
- cinecast_version: false, /* put to false to enable the platform version, true for the festival cinecast one. */
-
+ tags : [
+ {
+ "id" : "digitalstudies",
+ "meta" : {
+ "description" : "#digital-studies"
+ }
+ },
+ {
+ "id" : "amateur",
+ "meta" : {
+ "description" : "#amateur"
+ },
+ }
+ ],
+ remote_tags : false,
+ random_tags : false,
+ show_from_field : false,
+ polemic_mode : true, /* enable polemics ? */
+ polemics : [{
+ "className" : "positive",
+ "keyword" : "++"
+ }, {
+ "className" : "negative",
+ "keyword" : "--"
+ }, {
+ "className" : "reference",
+ "keyword" : "=="
+ }, {
+ "className" : "question",
+ "keyword" : "??"
+ }],
+ cinecast_version : false, /* put to false to enable the platform version, true for the festival cinecast one. */
+
/* where does the widget PUT the annotations - this is a mustache template. id refers to the id of the media ans is filled
- by the widget.
- */
- api_endpoint_template: platform_url + "/ldtplatform/api/ldt/annotations/{{id}}.json",
- api_method: "PUT"
+ by the widget.
+ */
+ api_endpoint_template : "", // platform_url + "/ldtplatform/api/ldt/annotations/{{id}}.json",
+ api_method : "PUT"
},
"SparklineWidget" : {
- column_width: 10 // the width of a column in pixels.
- },
- "Main" : {
- autoplay: true
+ lineColor : "#7492b4",
+ fillColor : "#aeaeb8",
+ lineWidth : 2
},
"AnnotationsListWidget" : {
- ajax_mode: true, /* use ajax to get information about the annotations.
- if set to false, only search in the annotations for the
- current project. */
+ ajax_mode : true, /* use ajax to get information about the annotations.
+ if set to false, only search in the annotations for the
+ current project. */
/* the platform generates some funky urls. We replace them afterwards to point to the
- correct place - this setting will probably be overwritten by the platform
- implementers.
- Note that the player has to replace the variables between {{ and }} by its own values.
- */
- ajax_url: platform_url + "/ldtplatform/api/ldt/segments/{media}/{begin}/{end}",
-
- ajax_granularity: 10000, /* how much ms should we look before and after the
- current timecode */
-
- default_thumbnail: "/metadataplayer/src/css/imgs/video_sequence.png",
-
- project_url: platform_url + "/ldtplatform/ldt/front/player/" /* the beginning
- of a link to the
- new front */
- }
- };
-};
-
-/*
-Override this if you want to change the info the player receives about the user.
-It's typically overrided in server-side templates with user-specific data.
-*/
-IriSP.defaults.user = function() { return {
- "name" : "Anonymous user",
- "avatar" : IriSP.paths.imgs + "/user_default_icon.png"
+ correct place - this setting will probably be overwritten by the platform
+ implementers.
+ Note that the player has to replace the variables between {{ and }} by its own values.
+ */
+ ajax_url : "", //platform_url + "/ldtplatform/api/ldt/segments/{{media}}/{{begin}}/{{end}}",
+ ajax_granularity : 10000, /* how much ms should we look before and after the current timecode */
+ default_thumbnail : "http://ldt.iri.centrepompidou.fr/static/site/ldt/css/imgs/video_sequence.png",
+ project_url : "", //platform_url + "/ldtplatform/ldt/front/player/"
+ /* the beginning of a link to the new front */
+ cinecast_version : false,
+ refresh_interval : 10000
+ },
+ "StackGraphWidget" : {
+ defaultcolor : "#585858",
+ tags : [
+ {
+ "keywords" : [ "++" ],
+ "description" : "positif",
+ "color" : "#1D973D"
+ },
+ {
+ "keywords" : [ "--" ],
+ "description" : "negatif",
+ "color" : "#CE0A15"
+ },
+ {
+ "keywords" : [ "==" ],
+ "description" : "reference",
+ "color" : "#C5A62D"
+ },
+ {
+ "keywords" : [ "??" ],
+ "description" : "question",
+ "color" : "#036AAE"
+ }
+ ],
+ streamgraph : false
}
-};
-
-
-IriSP.defaults.paths = {
-// "imgs": "/tweetlive/res/metadataplayer/src/css/imgs"
- "imgs": "/metadataplayer/src/css/imgs"
-};
-
-
-IriSP.defaults.default_templates_vars = function() {
- return {
- "img_dir" : IriSP.paths.imgs
- };
}/* the widget classes and definitions */
/**
@@ -1858,24 +1867,28 @@
this.selector.attr("widget-type", this._config.type);
}
-};
-
-// This functions checks for configuration options
-
-IriSP.Widget.prototype.checkOption = function(_name, _default) {
- this[_name] = (
- typeof this._config[_name] != "undefined"
- ? this._config[_name]
- : (
- (typeof IriSP.widgetsDefaults[this._config.type] != "undefined" && IriSP.widgetsDefaults[this._config.type][_name] != "undefined")
- ? IriSP.widgetsDefaults[this._config.type][_name]
- : (
- typeof _default != "undefined"
- ? _default
- : null
- )
- )
- )
+ // Parsing Widget Defaults
+ var _this = this;
+
+ if (typeof config.type == "string" && typeof IriSP.widgetsDefaults[config.type] == "object") {
+ IriSP._(IriSP.widgetsDefaults[config.type]).each(function(_v, _k) {
+ if (typeof config[_k] != "undefined") {
+ _this[_k] = config[_k];
+ } else {
+ _this[_k] = _v;
+ }
+ });
+ }
+
+};
+
+
+IriSP.Widget.prototype.currentMedia = function() {
+ return this._serializer.currentMedia();
+}
+
+IriSP.Widget.prototype.getDuration = function() {
+ return this._serializer.getDuration();
}
/**
@@ -1969,7 +1982,7 @@
this._widgets.push([widgetName, newDiv]);
var divTempl = "
$1'))
+ _$.html(_$.text().trim().replace(_this.searchRe, '