From 6e207dedcf8a214e6dfdd95e30c363a21cf0c35e Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Mon, 4 Dec 2017 17:21:13 +0100 Subject: [PATCH] global debug switch --- index.html | 1 + js/dist/main.min.js | 5 +- js/dist/pages.min.js | 2 +- js/dist/settings.min.js | 2 + js/main.js | 6 +- js/pages.js | 1114 ++++++++++++++++++++++++++++++++++++--- js/settings.js | 6 + 7 files changed, 1047 insertions(+), 89 deletions(-) create mode 100644 js/dist/settings.min.js create mode 100644 js/settings.js diff --git a/index.html b/index.html index 3c03cad..c91d43c 100644 --- a/index.html +++ b/index.html @@ -45,6 +45,7 @@ + diff --git a/js/dist/main.min.js b/js/dist/main.min.js index 193fcc4..1bea186 100644 --- a/js/dist/main.min.js +++ b/js/dist/main.min.js @@ -7,7 +7,8 @@ $('li.active',_$railway).on('click',function(event){dp=$(this).attr('class').mat function nextPages(){var i=_active_pages_keys.indexOf(_current_dp_key)+1;if(i<=_active_pages_keys.length-1){_current_dp_key=_active_pages_keys[i];changePages();}};function prevPages(){var i=_active_pages_keys.indexOf(_current_dp_key)-1;if(i>=0){_current_dp_key=_active_pages_keys[i];changePages();}};function changePages(){console.log("changePages",_current_dp_key);$('li',_$railway).removeClass('current');if(typeof _ACTIVE_PAGES[_current_dp_key]!=="undefined"){_current_dp_ob=_ACTIVE_PAGES[_current_dp_key];updatePagesDisplay();updatePaginationDisplay();updateRailwayDisplay();updateHash();updatePagesOverlays();}};function updatePagesDisplay(){if(typeof _current_dp_ob[0].bg!=="undefined"){var pl=_current_dp_ob[0];_$page_left.css({'background-image':"url("+_bgs_prefix+pl.bg+")"}).removeClass(pageClassToRemove).addClass('page-'+pl.page);_$pagi_l_txt.text(pl.page);}else{_$page_left.css({'background-image':"none"});_$pagi_l_txt.text("");} if(typeof _current_dp_ob[1].bg!=="undefined"){var pr=_current_dp_ob[1];_$page_right.css({'background-image':"url("+_bgs_prefix+pr.bg+")"}).removeClass(pageClassToRemove).addClass('page-'+pr.page);_$pagi_r_txt.text(pr.page);}else{_$page_right.css({'background-image':"none"});_$pagi_r_txt.text("");}};function pageClassToRemove(){var c=$(this).attr('class').match(/page-+\d+/);if(c&&c.length) return c[0];};function updatePaginationDisplay(){var i=_active_pages_keys.indexOf(_current_dp_key);if(i==0){_$pagi_l_arrow.addClass('hidden');}else{_$pagi_l_arrow.removeClass('hidden')} -if(i==_active_pages_keys.length-1){_$pagi_r_arrow.addClass('hidden');}else{_$pagi_r_arrow.removeClass('hidden')}};function updateRailwayDisplay(){$('li.double-page-'+_current_dp_key).addClass('current');};function updatePagesOverlays(){console.log("updatePagesOverlays");resetOverlays();var lr=0,p_ob,$p,map;for(var i in _current_dp_ob){p_ob=_current_dp_ob[i];console.log("p_ob",p_ob);$p=lr==0?_$maps_left:_$maps_right;for(var m in p_ob.overlays){map=p_ob.overlays[m];console.log('map',map);$p.append($('
').addClass("map").attr('overlay',map.over).attr('debug',map.debug).css({"left":map.x+"mm","top":map.y+"mm","width":map.w+"mm","height":map.h+"mm"}).bind("mouseover",function(e){$(this).parents('.page').find('.overlay').css({'background-image':'url(images/overlays/'+$(this).attr('overlay')+')'});}).bind("mouseout",function(e){$(this).parents('.page').find('.overlay').css({'background-image':'none'});}));} +if(i==_active_pages_keys.length-1){_$pagi_r_arrow.addClass('hidden');}else{_$pagi_r_arrow.removeClass('hidden')}};function updateRailwayDisplay(){$('li.double-page-'+_current_dp_key).addClass('current');};function updatePagesOverlays(){console.log("updatePagesOverlays");resetOverlays();var lr=0,p_ob,$p,map;for(var i in _current_dp_ob){p_ob=_current_dp_ob[i];console.log("p_ob",p_ob);$p=lr==0?_$maps_left:_$maps_right;for(var m in p_ob.overlays){map=p_ob.overlays[m];console.log('map',map);$p.append($('
').addClass("map").attr('overlay',map.over).attr('debug',_SETTINGS.debug?map.debug:_SETTINGS.debug).css({"left":map.x+"mm","top":map.y+"mm","width":map.w+"mm","height":map.h+"mm"}).bind("mouseover",function(e){$(this).parents('.page').find('.overlay').css({'background-image':'url(images/overlays/'+$(this).attr('overlay')+')'});}).bind("mouseout",function(e){$(this).parents('.page').find('.overlay').css({'background-image':'none'});}));} lr++;}};function resetOverlays(){$('.overlay, .maps','.page').css({'background-image':'none'}).children().remove();} -function initHashNav(){h=window.location.hash;console.log('hash',h);_current_dp_key=h.match(/^#(\d+)$/)[1];} +function initHashNav(){console.log('initHashNav');h=window.location.hash;console.log('hash',h);if(h) +_current_dp_key=h.match(/^#(\d+)$/)[1];} function updateHash(){window.location.hash=_current_dp_key;};function initkeyboard(){keyboardJS.bind('right',function(event){nextPages();});keyboardJS.bind('left',function(event){prevPages();});};function initPagination(){$('.wrapper-l .l',_$pagination).on('click',function(event){prevPages();});$('.wrapper-r .l',_$pagination).on('click',function(event){nextPages();});};init();}); \ No newline at end of file diff --git a/js/dist/pages.min.js b/js/dist/pages.min.js index 5a17a1b..8f3da73 100644 --- a/js/dist/pages.min.js +++ b/js/dist/pages.min.js @@ -1,2 +1,2 @@ -var _ACTIVE_PAGES={"0":[{"active":false},{"page":0,"bg":"00_1couv.jpeg","overlays":[]}],"1":[{"page":1,"bg":"00_1couvV.jpeg","overlays":[]},{"page":2,"bg":"01_anan.jpeg","overlays":[]}],"2":[{"page":3,"bg":"02_TH.jpeg","overlays":[]},{"page":4,"bg":"03_ologyOf.jpeg","overlays":[]}],"3":[{"page":5,"bg":"04_chance.jpeg","overlays":[{"x":0,"y":0,"w":227,"h":207,"over":"04_chance-RB.svg","debug":false}]},{"page":6,"bg":"05_Stories.jpeg","overlays":[]}],"4":[{"page":7,"bg":"06_byGeorge.jpeg","overlays":[]},{"page":8,"bg":"07_Copyright.jpeg","overlays":[]}],"5":[{"page":9,"bg":"08_Brecht.jpeg","overlays":[{"x":110,"y":25,"w":103,"h":70,"over":"09_indetermenacy.svg","debug":false},{"x":112,"y":133,"w":105,"h":69,"over":"09_composition.svg","debug":true}]},{"active":false}],"7":[{"page":13,"bg":"12_Bremer.jpeg","overlays":[]},{"active":false}],"8":[{"page":15,"bg":"14_Brown.jpeg","overlays":[]},{"active":false}],"12":[{"active":false},{"page":24,"bg":"23_Byrd.jpeg","overlays":[]}],"14":[{"page":27,"bg":"26_Cage.jpeg","overlays":[]},{"active":false}],"15":[{"page":29,"bg":"28_deMaria.jpeg","overlays":[]},{"active":false}],"17":[{"page":33,"bg":"32_Flynt.jpeg","overlays":[]},{"active":false}],"19":[{"active":false},{"page":38,"bg":"37_Ono.jpeg","overlays":[]}],"20":[{"active":false},{"page":40,"bg":"39_HIggins.jpeg","overlays":[]}],"21":[{"active":false},{"page":42,"bg":"41_Ichiyanagi.jpeg","overlays":[]}],"23":[{"active":false},{"page":46,"bg":"45_Jennings.jpeg","overlays":[]}],"25":[{"page":49,"bg":"48_Dennis.jpeg","overlays":[]},{"active":false}],"28":[{"page":55,"bg":"54_DingDong.jpeg","overlays":[]},{"active":false}],"29":[{"page":57,"bg":"56_Johnson.jpeg","overlays":[]},{"active":false}],"30":[{"page":59,"bg":"58_MacLow.jpeg","overlays":[]},{"active":false}],"40":[{"active":false},{"page":80,"bg":"79_Maxfield.jpeg","overlays":[]}],"46":[{"page":91,"bg":"90_Simone.jpeg","overlays":[]},{"active":false}],"47":[{"page":93,"bg":"92_Paik.jpeg","overlays":[]},{"active":false}],"48":[{"page":95,"bg":"94_Riley.jpeg","overlays":[]},{"active":false}],"50":[{"active":false},{"page":100,"bg":"99_Rot.jpeg","overlays":[]}],"51":[{"page":101,"bg":"100_Williams.jpeg","overlays":[]},{"active":false}],"53":[{"page":105,"bg":"104_Wolff.jpeg","overlays":[]},{"active":false}],"55":[{"page":109,"bg":"108_Young.jpeg","overlays":[]},{"active":false}],"56":[{"page":111,"bg":"110_StraightLine.jpeg","overlays":[]},{"active":false}],"57":[{"page":113,"bg":"112_Portrait?.jpeg","overlays":[]},{"page":114,"bg":"113_4couv.jpeg","overlays":[]}],"58":[{"page":115,"bg":"114_4couv.jpeg","overlays":[]},{"active":false}]}; \ No newline at end of file +var _ACTIVE_PAGES={"0":[{"active":true},{"page":0,"bg":"00_1couv.jpeg","overlays":[{"x":200,"y":0,"w":28,"h":30,"over":"dada1.svg","link":7,"repere_x":40,"repere_y":56,"repere":"mon.svg","debug":false},{"x":200,"y":29,"w":28,"h":30,"over":"dada2.svg","debug":false},{"x":200,"y":58,"w":28,"h":30,"over":"dada3.svg","debug":false},{"x":200,"y":87,"w":28,"h":30,"over":"dada4_5.svg","debug":false},{"x":200,"y":116,"w":28,"h":30,"over":"dada6.svg","debug":false},{"x":200,"y":145,"w":28,"h":30,"over":"dada7.svg","debug":false},]}],"1":[{"page":1,"bg":"00_1couvV.jpeg","overlays":[{"x":100,"y":100,"w":10,"h":10,"over":"mire_rn.svg","debug":true},{"x":100,"y":109,"w":10,"h":11,"over":"mire_r.svg","debug":false},{"x":109,"y":100,"w":11,"h":10,"over":"mire_v.svg","debug":false},{"x":109,"y":109,"w":11,"h":11,"over":"mire_vn.svg","debug":false},]},{"page":2,"bg":"01_anan.jpeg","overlays":[{"x":58,"y":10,"w":110,"h":100,"over":"an_gris_final.svg","debug":false},{"x":50,"y":106,"w":65,"h":100,"over":"an_ai_kerning.svg","debug":false},{"x":112,"y":106,"w":70,"h":100,"over":"an_gm_kerning.svg","debug":false},{"x":180,"y":0,"w":50,"h":50,"over":"anna_blume_couv.svg","debug":false},{"x":180,"y":48,"w":50,"h":50,"over":"anna_dada+T.svg","debug":false},{"x":180,"y":96,"w":50,"h":50,"over":"anna_dada+Ten.svg","debug":false},{"x":180,"y":144,"w":50,"h":50,"over":"anna_dada+Tfr.svg","debug":false}]}],"2":[{"page":3,"bg":"02_TH.jpeg","overlays":[{"x":2,"y":101,"w":105,"h":10,"over":"02_TH_Hg+.svg","debug":false},{"x":107,"y":154,"w":91,"h":10,"over":"02_TH_Hd+.svg","debug":false},{"x":45,"y":110,"w":10,"h":97,"over":"02_TH_Vg.svg","debug":false},{"x":98,"y":110,"w":10,"h":97,"over":"02_TH_Vc.svg","debug":false},{"x":197,"y":102,"w":10,"h":105,"over":"02_TH_Vd.svg","debug":false},{"x":210,"y":0,"w":18,"h":21,"over":"03_method.svg","debug":false},{"x":210,"y":20,"w":18,"h":21,"over":"03_eth.svg","debug":false},{"x":210,"y":40,"w":18,"h":21,"over":"03_phil.svg","debug":false},{"x":210,"y":60,"w":18,"h":21,"over":"03_phytosoci.svg","debug":false},{"x":210,"y":80,"w":18,"h":21,"over":"03_bi.svg","debug":false},{"x":210,"y":100,"w":18,"h":21,"over":"03_path.svg","debug":false},{"x":210,"y":120,"w":18,"h":21,"over":"03_uro.svg","debug":false},{"x":210,"y":140,"w":18,"h":21,"over":"03_pharmac.svg","debug":false},{"x":210,"y":160,"w":18,"h":21,"over":"03_paleont.svg","debug":false},{"x":210,"y":180,"w":18,"h":21,"over":"learning.svg","debug":false}]},{"page":4,"bg":"03_ologyOf.jpeg","overlays":[{"x":125,"y":0,"w":20,"h":207,"over":"04_ology_of.svg","debug":false}]}],"3":[{"page":5,"bg":"04_chance.jpeg","overlays":[{"x":140,"y":14,"w":10,"h":22,"over":"05_ra_operation_std.svg","debug":false},{"x":149,"y":14,"w":12,"h":22,"over":"05_ra_operation_lig.svg","debug":false},{"x":145,"y":12,"w":10,"h":10,"over":"05_ra_operation_cor.svg","debug":false},{"x":16,"y":111,"w":28,"h":52,"over":"05_a_art.svg","debug":false},{"x":43,"y":111,"w":5,"h":52,"over":"05_a_art_cor.svg","debug":false},{"x":62,"y":132,"w":11,"h":30,"over":"05_t_art.svg","debug":false},{"x":160,"y":14,"w":10,"h":20,"over":"05_t_operation.svg","debug":false},{"x":160,"y":5,"w":10,"h":10,"over":"05_t_operation_cor.svg","debug":false},{"x":44,"y":190,"w":10,"h":17,"over":"05_t_natural.svg","debug":false},{"x":44,"y":183,"w":10,"h":8,"over":"05_t_natural_cor.svg","debug":false},{"x":172,"y":190,"w":10,"h":17,"over":"05_t_disasters.svg","debug":false},{"x":172,"y":183,"w":10,"h":8,"over":"05_t_disasters_cor.svg","debug":false},{"x":16,"y":95,"w":35,"h":15,"over":"05_t_concept.svg","debug":false},{"x":50,"y":95,"w":7,"h":15,"over":"05_t_concept_cor.svg","debug":false},]},{"page":6,"bg":"05_Stories.jpeg","overlays":[]}],"4":[{"page":7,"bg":"06_byGeorge.jpeg","overlays":[]},{"page":8,"bg":"07_Copyright.jpeg","overlays":[]}],"5":[{"page":9,"bg":"08_Brecht.jpeg","overlays":[{"x":32,"y":8,"w":112,"h":10,"over":"05_brecht.svg","debug":false},{"x":15,"y":71,"w":105,"h":48,"over":"05_music50.svg","debug":false},{"x":120,"y":25,"w":103,"h":70,"over":"04_indeterminacy.svg","debug":false},{"x":112,"y":132,"w":103,"h":70,"over":"05_compositions.svg","debug":false},{"x":120,"y":94,"w":103,"h":39,"over":"05_music_indeterminacy.svg","debug":false},{"x":59,"y":118,"w":54,"h":80,"over":"05_music_indeterminacy_compo.svg","debug":false},{"x":10,"y":118,"w":50,"h":80,"over":"05_brecht_m_i_c.svg","debug":false}]},{"active":true}],"7":[{"page":13,"bg":"12_Bremer.jpeg","overlays":[{"x":15,"y":18,"w":60,"h":10,"over":"07_bremer.svg","debug":false},{"x":175,"y":8,"w":40,"h":10,"over":"07_bremer.svg","debug":false},{"x":181,"y":18,"w":35,"h":108,"over":"05_poetry.svg","debug":false},{"x":175,"y":125,"w":50,"h":110,"over":"07_bremer_poetry.svg","debug":false},]},{"active":true}],"8":[{"page":15,"bg":"14_Brown.jpeg","overlays":[{"x":72,"y":18,"w":102,"h":10,"over":"07_brown.svg","debug":false},{"x":46,"y":60,"w":106,"h":48,"over":"05_music50.svg","debug":false},{"x":186,"y":5,"w":35,"h":108,"over":"05_essays.svg","debug":false},]},{"active":true}],"12":[{"active":true},{"page":24,"bg":"23_Byrd.jpeg","overlays":[{"x":10,"y":29,"w":82,"h":10,"over":"07_byrd.svg","debug":false},{"x":188,"y":19,"w":25,"h":10,"over":"07_byrd.svg","debug":false},{"x":36,"y":62,"w":107,"h":48,"over":"05_music50.svg","debug":false},{"x":142,"y":0,"w":35,"h":108,"over":"05_poetry.svg","debug":false},{"x":176,"y":40,"w":40,"h":148,"over":"05_music_poetry.svg","debug":false},]}],"14":[{"page":27,"bg":"26_Cage.jpeg","overlays":[{"x":70,"y":100,"w":90,"h":10,"over":"07_cage.svg","debug":false},]},{"active":true}],"15":[{"page":29,"bg":"28_deMaria.jpeg","overlays":[{"x":125,"y":18,"w":90,"h":10,"over":"07_walter_de_maria.svg","debug":false},{"x":18,"y":30,"w":50,"h":10,"over":"07_brown.svg","debug":false},{"x":178,"y":37,"w":35,"h":108,"over":"05_essays.svg","debug":false},{"x":108,"y":37,"w":71,"h":103,"over":"05_compositions.svg","debug":false},]},{"active":true}],"17":[{"page":33,"bg":"32_Flynt.jpeg","overlays":[{"x":71,"y":49,"w":97,"h":10,"over":"07_flynt.svg","debug":false},{"x":177,"y":3,"w":35,"h":108,"over":"05_essays.svg","debug":false},]},{"active":true}],"19":[{"active":true},{"page":38,"bg":"37_Ono.jpeg","overlays":[{"x":14,"y":69,"w":25,"h":10,"over":"07_ono.svg","debug":false},{"x":173,"y":57,"w":35,"h":10,"over":"07_ono.svg","debug":false},{"x":138,"y":7,"w":35,"h":108,"over":"05_poetry.svg","debug":false},{"x":172,"y":66,"w":40,"h":58,"over":"07_ono+poetry.svg","debug":false},]}],"20":[{"active":true},{"page":40,"bg":"39_HIggins.jpeg","overlays":[{"x":76,"y":31,"w":97,"h":10,"over":"07_higgins.svg","debug":false},{"x":118,"y":106,"w":103,"h":70,"over":"05_compositions.svg","debug":false},]}],"21":[{"active":true},{"page":42,"bg":"41_Ichiyanagi.jpeg","overlays":[{"x":13,"y":80,"w":82,"h":10,"over":"07_ichiyanagi.svg","debug":false},{"x":171,"y":67,"w":41,"h":10,"over":"07_ichiyanagi.svg","debug":false},{"x":43,"y":91,"w":105,"h":48,"over":"05_music50.svg","debug":false},]}],"23":[{"active":true},{"page":46,"bg":"45_Jennings.jpeg","overlays":[{"x":86,"y":74,"w":112,"h":10,"over":"07_jennings.svg","debug":false},{"x":28,"y":84,"w":105,"h":48,"over":"05_music50.svg","debug":false},]}],"25":[{"page":49,"bg":"48_Dennis.jpeg","overlays":[{"x":76,"y":115,"w":48,"h":10,"over":"07_dennis.svg","debug":false},]},{"active":true}],"28":[{"page":55,"bg":"54_DingDong.jpeg","overlays":[{"x":87,"y":122,"w":79,"h":10,"over":"07_dingdong.svg","debug":false},{"x":63,"y":75,"w":105,"h":48,"over":"05_music50.svg","debug":false},]},{"active":true}],"29":[{"page":57,"bg":"56_Johnson.jpeg","overlays":[{"x":139,"y":96,"w":43,"h":10,"over":"07_johnson.svg","debug":false},{"x":181,"y":96,"w":35,"h":12,"over":"07_johnson+poetry.svg","debug":false},{"x":17,"y":108,"w":33,"h":10,"over":"07_johnson.svg","debug":false},{"x":104,"y":155,"w":112,"h":10,"over":"07_johnson.svg","debug":false},{"x":181,"y":7,"w":35,"h":90,"over":"05_poetry.svg","debug":false},{"x":181,"y":107,"w":35,"h":20,"over":"05_poetry.svg","debug":false},]},{"active":true}],"30":[{"page":59,"bg":"58_MacLow.jpeg","overlays":[{"x":38,"y":105,"w":130,"h":10,"over":"07_maclow.svg","debug":false},{"x":42,"y":58,"w":106,"h":48,"over":"05_music50.svg","debug":false},{"x":147,"y":0,"w":35,"h":108,"over":"05_poetry.svg","debug":false},{"x":181,"y":0,"w":35,"h":108,"over":"05_essays.svg","debug":false},{"x":108,"y":139,"w":104,"h":70,"over":"04_indeterminacy.svg","debug":false},]},{"active":true}],"40":[{"active":true},{"page":80,"bg":"79_Maxfield.jpeg","overlays":[{"x":191,"y":117,"w":20,"h":10,"over":"07_maxfield.svg","debug":false},{"x":14,"y":131,"w":121,"h":10,"over":"07_maxfield.svg","debug":false},{"x":173,"y":9,"w":35,"h":108,"over":"05_essays.svg","debug":false},]}],"46":[{"page":91,"bg":"90_Simone.jpeg","overlays":[{"x":70,"y":124,"w":50,"h":10,"over":"07_forti.svg","debug":false},]},{"active":true}],"47":[{"page":93,"bg":"92_Paik.jpeg","overlays":[{"x":185,"y":106,"w":28,"h":10,"over":"07_paik.svg","debug":false},{"x":17,"y":117,"w":80,"h":10,"over":"07_paik.svg","debug":false},{"x":178,"y":5,"w":35,"h":93,"over":"05_essays.svg","debug":false},]},{"active":true}],"48":[{"page":95,"bg":"94_Riley.jpeg","overlays":[{"x":99,"y":141,"w":103,"h":11,"over":"07_riley.svg","debug":false},{"x":30,"y":65,"w":105,"h":48,"over":"05_music50.svg","debug":false},]},{"active":true}],"50":[{"active":true},{"page":100,"bg":"99_Rot.jpeg","overlays":[{"x":25,"y":167,"w":75,"h":10,"over":"07_rot.svg","debug":false},{"x":168,"y":15,"w":35,"h":108,"over":"05_poetry.svg","debug":false},]}],"51":[{"page":101,"bg":"100_Williams.jpeg","overlays":[{"x":33,"y":178,"w":137,"h":10,"over":"07_williams.svg","debug":false},{"x":164,"y":23,"w":35,"h":108,"over":"05_poetry.svg","debug":false},]},{"active":true}],"53":[{"page":105,"bg":"104_Wolff.jpeg","overlays":[{"x":162,"y":165,"w":55,"h":10,"over":"07_wolff.svg","debug":false},{"x":17,"y":177,"w":79,"h":10,"over":"07_brown.svg","debug":false},{"x":43,"y":67,"w":105,"h":48,"over":"05_music50.svg","debug":false},]},{"active":true}],"55":[{"page":109,"bg":"108_Young.jpeg","overlays":[{"x":96,"y":183,"w":122,"h":10,"over":"07_young.svg","debug":false},{"x":112,"y":111,"w":103,"h":70,"over":"05_compositions.svg","debug":false},]},{"active":true}],"56":[{"page":111,"bg":"110_StraightLine.jpeg","overlays":[]},{"active":true}],"57":[{"page":113,"bg":"112_Portrait?.jpeg","overlays":[]},{"page":114,"bg":"113_4couv.jpeg","overlays":[]}],"58":[{"page":115,"bg":"114_4couv.jpeg","overlays":[{"x":140,"y":5,"w":80,"h":200,"over":"hausmann.svg","debug":false}]},{"active":true}]}; \ No newline at end of file diff --git a/js/dist/settings.min.js b/js/dist/settings.min.js new file mode 100644 index 0000000..faffb08 --- /dev/null +++ b/js/dist/settings.min.js @@ -0,0 +1,2 @@ + +var _SETTINGS={'debug':false}; \ No newline at end of file diff --git a/js/main.js b/js/main.js index 677145f..d36a903 100644 --- a/js/main.js +++ b/js/main.js @@ -241,7 +241,7 @@ $(document).ready(function() { $('
') .addClass("map") .attr('overlay', map.over) - .attr('debug', map.debug) + .attr('debug', _SETTINGS.debug ? map.debug : _SETTINGS.debug) .css({ "left":map.x+"mm", "top":map.y+"mm", @@ -277,9 +277,11 @@ $(document).ready(function() { // /_/ |_/_/ /_/\___/_/ /_/\____/_/ /____/ function initHashNav(){ + console.log('initHashNav'); h = window.location.hash; console.log('hash',h); - _current_dp_key = h.match(/^#(\d+)$/)[1]; + if(h) + _current_dp_key = h.match(/^#(\d+)$/)[1]; } function updateHash(){ diff --git a/js/pages.js b/js/pages.js index 3a87429..b393d53 100644 --- a/js/pages.js +++ b/js/pages.js @@ -1,34 +1,308 @@ var _ACTIVE_PAGES={ - "0":[ // debut de la première double page, numéro de la double page - {"active":false}, // page de gauche, inactive - { // debut de page de droite - "page":0, // numéro de la page - "bg":"00_1couv.jpeg", // image a afficher pour cette page - "overlays":[] // listes des zones interactives + "0":[ // début de la première double page, numéro de la double page + {"active":true}, // page de gauche, inactive + { // début de page de droite + "page":0, // numéro de la page --COUVERTURE ROUGE-- + "bg":"00_1couv.jpeg", // image a afficher pour cette page + "overlays":[ // debut liste des zones actives + { // debut zone active : dada 1 + "x":200, // position x coin supérieur gauche zone active (entre 0 et 227 mm) + "y":0, // position y coin supérieur gauche zone active (entre 0 et 207 mm) + "w":28, // largeur zone active + "h":30, // hauteur zone active + "over":"dada1.svg", // image affichée au survol + "link":7, // click go to page + "repere_x":40, // position x de l'indicateur de survol + "repere_y":56, // position y de l'indicateur de survol + "repere":"mon.svg", // svg a afficher comme indicateur de survol au click sur page + "debug":false // true: zone visible, true: zone invisible, + }, // fin zone active 1 + { // dada 2 + "x":200, + "y":29, + "w":28, + "h":30, + "over":"dada2.svg", + "debug":false + }, + { // dada 3 + "x":200, + "y":58, + "w":28, + "h":30, + "over":"dada3.svg", + "debug":false + }, + { // dada 4 & 5 + "x":200, + "y":87, + "w":28, + "h":30, + "over":"dada4_5.svg", + "debug":false + }, + { // dada 6 + "x":200, + "y":116, + "w":28, + "h":30, + "over":"dada6.svg", + "debug":false + }, + { // dada 7 + "x":200, + "y":145, + "w":28, + "h":30, + "over":"dada7.svg", + "debug":false + }, + ] // fin liste des zones interactives (overlays) } // fin de la page de droite ], // fin de la double page "1":[ { "page":1, "bg":"00_1couvV.jpeg", - "overlays":[] + "overlays":[ + { // TEST MIRE Rouge 5 X 5 + "x":100, + "y":100, + "w":10, + "h":10, + "over":"mire_rn.svg", + "debug":true + }, + { // TEST MIRE Rouge 5 X 5 + "x":100, + "y":109, + "w":10, + "h":11, + "over":"mire_r.svg", + "debug":false + }, + { // TEST MIRE Verte + "x":109, + "y":100, + "w":11, + "h":10, + "over":"mire_v.svg", + "debug":false + }, + { // TEST MIRE Verte 10 x 10 + "x":109, + "y":109, + "w":11, + "h":11, + "over":"mire_vn.svg", + "debug":false + }, + ] }, { - "page":2, + "page":2, //__ AN AN __// "bg":"01_anan.jpeg", - "overlays":[] + "overlays":[ + { // an outline en haut + "x":58, + "y":10, + "w":110, + "h":100, + "over":"an_gris_final.svg", + "debug":false + }, + { // a bas + "x":50, + "y":106, + "w":65, + "h":100, + "over":"an_ai_kerning.svg", + "debug":false + }, + + { // n bas + "x":112, + "y":106, + "w":70, + "h":100, + "over":"an_gm_kerning.svg", + "debug":false + }, + { // an anna blume (couverture) + "x":180, + "y":0, + "w":50, + "h":50, + "over":"anna_blume_couv.svg", + "debug":false + }, + { // anna blume / texte allemand + "x":180, + "y":48, + "w":50, + "h":50, + "over":"anna_dada+T.svg", + "debug":false + }, + { // anna blume / anglais + "x":180, + "y":96, + "w":50, + "h":50, + "over":"anna_dada+Ten.svg", + "debug":false + }, + { // anna blume / français + "x":180, + "y":144, + "w":50, + "h":50, + "over":"anna_dada+Tfr.svg", + "debug":false + } + ] // fin liste zones actives } ], "2":[ { "page":3, "bg":"02_TH.jpeg", - "overlays":[] + "overlays":[ + { // mesure T horizontale + "x":2, + "y":101, + "w":105, + "h":10, + "over":"02_TH_Hg+.svg", + "debug":false + }, + { // mesure H horizontale + "x":107, + "y":154, + "w":91, + "h":10, + "over":"02_TH_Hd+.svg", + "debug":false + }, + { // mesure T horizontal gauche + "x":45, + "y":110, + "w":10, + "h":97, + "over":"02_TH_Vg.svg", + "debug":false + }, + { // mesure T horizontal centre + "x":98, + "y":110, + "w":10, + "h":97, + "over":"02_TH_Vc.svg", + "debug":false + }, + { // mesure T horizontal droite + "x":197, + "y":102, + "w":10, + "h":105, + "over":"02_TH_Vd.svg", + "debug":false + }, + { // 1- METHOD- / EC- + "x":210, + "y":0, + "w":18, + "h":21, + "over":"03_method.svg", + "debug":false + }, + { // 2- ETH- / ABNORMAL PSYCH- + "x":210, + "y":20, + "w":18, + "h":21, + "over":"03_eth.svg", + "debug":false + }, + { // 3- PHYL- / SYNEC- + "x":210, + "y":40, + "w":18, + "h":21, + "over":"03_phil.svg", + "debug":false + }, + { // 4- PHYTOSOCIO- / MORPH- + "x":210, + "y":60, + "w":18, + "h":21, + "over":"03_phytosoci.svg", + "debug":false + }, + { // 5- MOLECULAR BI- / NEUROPHYSI- + "x":210, + "y":80, + "w":18, + "h":21, + "over":"03_bi.svg", + "debug":false + }, + { // 6_ PATH- / GASTROENTER- + "x":210, + "y":100, + "w":18, + "h":21, + "over":"03_path.svg", + "debug":false + }, + { // 7- URO / PHARMAC- + "x":210, + "y":120, + "w":18, + "h":21, + "over":"03_uro.svg", + "debug":false + }, + { // 8- PHON- / OT- + "x":210, + "y":140, + "w":18, + "h":21, + "over":"03_pharmac.svg", + "debug":false + }, + { // 9- PHON- / PHYSI- + "x":210, + "y":160, + "w":18, + "h":21, + "over":"03_paleont.svg", + "debug":false + }, + { // PHON- / PHYSI- + "x":210, + "y":180, + "w":18, + "h":21, + "over":"learning.svg", + "debug":false + } + ] }, { "page":4, "bg":"03_ologyOf.jpeg", - "overlays":[] + "overlays":[ + { + "x":125, + "y":0, + "w":20, + "h":207, + "over":"04_ology_of.svg", //+ology1.svg ? déjà fait ? + "debug":false + } + ] } ], "3":[ @@ -36,15 +310,119 @@ var _ACTIVE_PAGES={ "page":5, "bg":"04_chance.jpeg", "overlays":[ - { - "x":0, - "y":0, - "w":227, - "h":207, - "over":"04_chance-RB.svg", + { // RA : chance operation std + "x":140, + "y":14, + "w":10, + "h":22, + "over":"05_ra_operation_std.svg", "debug":false - } - ] + }, + { // RA : operation ligature + "x":149, + "y":14, + "w":12, + "h":22, + "over":"05_ra_operation_lig.svg", + "debug":false + }, + { // RA : chance operation corrigé + "x":145, + "y":12, + "w":10, + "h":10, + "over":"05_ra_operation_cor.svg", + "debug":false + }, + { // A : concept art + "x":16, + "y":111, + "w":28, + "h":52, + "over":"05_a_art.svg", + "debug":false + }, + { // A : concept art corrigé + "x":43, + "y":111, + "w":5, + "h":52, + "over":"05_a_art_cor.svg", + "debug":false + }, + { // T : art + "x":62, + "y":132, + "w":11, + "h":30, + "over":"05_t_art.svg", + "debug":false + }, + { // T : chance operation + "x":160, + "y":14, + "w":10, + "h":20, + "over":"05_t_operation.svg", + "debug":false + }, + { // T : chance operation corrigé + "x":160, + "y":5, + "w":10, + "h":10, + "over":"05_t_operation_cor.svg", + "debug":false + }, + { // T : natural + "x":44, + "y":190, + "w":10, + "h":17, + "over":"05_t_natural.svg", + "debug":false + }, + { // T : natural corrigé + "x":44, + "y":183, + "w":10, + "h":8, + "over":"05_t_natural_cor.svg", + "debug":false + }, + { // T : desasters + "x":172, + "y":190, + "w":10, + "h":17, + "over":"05_t_disasters.svg", + "debug":false + }, + { // T : desasters corrigé + "x":172, + "y":183, + "w":10, + "h":8, + "over":"05_t_disasters_cor.svg", + "debug":false + }, + { // T : concept + "x":16, + "y":95, + "w":35, + "h":15, + "over":"05_t_concept.svg", + "debug":false + }, + { // T : concept corrigé + "x":50, + "y":95, + "w":7, + "h":15, + "over":"05_t_concept_cor.svg", + "debug":false + }, + ] }, { "page":6, @@ -68,202 +446,761 @@ var _ACTIVE_PAGES={ { // debut de la page de gauche "page":9, // numéro de la page "bg":"08_Brecht.jpeg", // image de la page - "overlays":[ // debut de la liste des zone active - { // debut de la zone active 1 - "x":110, // position x du coin supérieur gauche de la zone active (entre 0 et 200) - "y":25, // position y du coin supérieur gauche de la zone active (entre 0 et 200) - "w":103, // largeur de la zone active - "h":70, // hauteur de la zone active - "over":"09_indetermenacy.svg", // image affiché au survol - "debug":false // true: zone visible, false: zone invisible - }, // fin de la zone active 1 - { // début de la zone active 2 - "x":112, // position x - "y":133, // position y - "w":105, // largeur - "h":69, // hauteur - "over":"09_composition.svg", // image au survol - "debug":true // debug - } // fin de la zone active 2 + "overlays":[ + { // george brecht + "x":32, + "y":8, + "w":112, + "h":10, + "over":"05_brecht.svg", + "debug":false + }, + { // music (gris 50) + "x":15, + "y":71, + "w":105, + "h":48, + "over":"05_music50.svg", + "debug":false + }, + { // indeterminacy + "x":120, + "y":25, + "w":103, + "h":70, + "over":"04_indeterminacy.svg", + "debug":false + }, + { // compositions + "x":112, + "y":132, + "w":103, + "h":70, + "over":"05_compositions.svg", + "debug":false + }, + { // music + indeterminacy + "x":120, + "y":94, + "w":103, + "h":39, + "over":"05_music_indeterminacy.svg", + "debug":false + }, + { // music + indeterminacy + compositions + "x":59, + "y":118, + "w":54, + "h":80, + "over":"05_music_indeterminacy_compo.svg", + "debug":false + }, + { // brecht + music + indeterminacy + compositions + "x":10, + "y":118, + "w":50, + "h":80, + "over":"05_brecht_m_i_c.svg", + "debug":false + } ] // fin de la liste des zones actives }, // fin de la page de gauche - {"active":false} // page de droite inactive + {"active":true} // page de droite inactive ], // fin de la double page 5 "7":[ { "page":13, "bg":"12_Bremer.jpeg", - "overlays":[] + "overlays":[ + { // (claus) bremer + "x":15, + "y":18, + "w":60, + "h":10, + "over":"07_bremer.svg", + "debug":false + }, + { // claus (bremer) + "x":175, + "y":8, + "w":40, + "h":10, + "over":"07_bremer.svg", + "debug":false + }, + { // poetry + "x":181, + "y":18, + "w":35, + "h":108, + "over":"05_poetry.svg", + "debug":false + }, + { // bremer + poetry + "x":175, + "y":125, + "w":50, + "h":110, + "over":"07_bremer_poetry.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "8":[ { "page":15, "bg":"14_Brown.jpeg", - "overlays":[] + "overlays":[ + { // earle brown + "x":72, + "y":18, + "w":102, + "h":10, + "over":"07_brown.svg", + "debug":false + }, + { // music (gris 50) + "x":46, + "y":60, + "w":106, + "h":48, + "over":"05_music50.svg", + "debug":false + }, + { // essays + "x":186, + "y":5, + "w":35, + "h":108, + "over":"05_essays.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "12":[ - {"active":false}, + {"active":true}, { "page":24, "bg":"23_Byrd.jpeg", - "overlays":[] + "overlays":[ + { // jo-seph byrd + "x":10, + "y":29, + "w":82, + "h":10, + "over":"07_byrd.svg", + "debug":false + }, + { // jo-seph byrd + "x":188, + "y":19, + "w":25, + "h":10, + "over":"07_byrd.svg", + "debug":false + }, + { // music (gris 50) + "x":36, + "y":62, + "w":107, + "h":48, + "over":"05_music50.svg", + "debug":false + }, + { // poetry + "x":142, + "y":0, + "w":35, + "h":108, + "over":"05_poetry.svg", + "debug":false + }, + { // music + poetry + "x":176, + "y":40, + "w":40, + "h":148, + "over":"05_music_poetry.svg", + "debug":false + }, + + ] } ], "14":[ { "page":27, "bg":"26_Cage.jpeg", - "overlays":[] + "overlays":[ + { // john cage + "x":70, + "y":100, + "w":90, + "h":10, + "over":"07_cage.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "15":[ { "page":29, "bg":"28_deMaria.jpeg", - "overlays":[] + "overlays":[ + { // walter de maria + "x":125, + "y":18, + "w":90, + "h":10, + "over":"07_walter_de_maria.svg", + "debug":false + }, + { // walter de maria + "x":18, + "y":30, + "w":50, + "h":10, + "over":"07_brown.svg", + "debug":false + }, + { // esays + "x":178, + "y":37, + "w":35, + "h":108, + "over":"05_essays.svg", + "debug":false + }, + { // compositions + "x":108, + "y":37, + "w":71, + "h":103, + "over":"05_compositions.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "17":[ { "page":33, "bg":"32_Flynt.jpeg", - "overlays":[] + "overlays":[ + { // henry flynt + "x":71, + "y":49, + "w":97, + "h":10, + "over":"07_flynt.svg", + "debug":false + }, + { // essays + "x":177, + "y":3, + "w":35, + "h":108, + "over":"05_essays.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "19":[ - {"active":false}, + {"active":true}, { "page":38, "bg":"37_Ono.jpeg", - "overlays":[] + "overlays":[ + { // yoko (ono) + "x":14, + "y":69, + "w":25, + "h":10, + "over":"07_ono.svg", + "debug":false + }, + { // (yoko) ono + "x":173, + "y":57, + "w":35, + "h":10, + "over":"07_ono.svg", + "debug":false + }, + { // poetry + "x":138, + "y":7, + "w":35, + "h":108, + "over":"05_poetry.svg", + "debug":false + }, + { // yoko ono + poetry + "x":172, + "y":66, + "w":40, + "h":58, + "over":"07_ono+poetry.svg", + "debug":false + }, + ] } ], "20":[ - {"active":false}, + {"active":true}, { "page":40, "bg":"39_HIggins.jpeg", - "overlays":[] + "overlays":[ + { // dick higgins + "x":76, + "y":31, + "w":97, + "h":10, + "over":"07_higgins.svg", + "debug":false + }, + { // compositions + "x":118, + "y":106, + "w":103, + "h":70, + "over":"05_compositions.svg", + "debug":false + }, + ] } ], "21":[ - {"active":false}, + {"active":true}, { "page":42, "bg":"41_Ichiyanagi.jpeg", - "overlays":[] + "overlays":[ + { // i(toshi) chiyanagi + "x":13, + "y":80, + "w":82, + "h":10, + "over":"07_ichiyanagi.svg", + "debug":false + }, + { // ichiyanagi + "x":171, + "y":67, + "w":41, + "h":10, + "over":"07_ichiyanagi.svg", + "debug":false + }, + { // music (gris 50) + "x":43, + "y":91, + "w":105, + "h":48, + "over":"05_music50.svg", + "debug":false + }, + ] } ], "23":[ - {"active":false}, + {"active":true}, { "page":46, "bg":"45_Jennings.jpeg", - "overlays":[] + "overlays":[ + { // terry jennings + "x":86, + "y":74, + "w":112, + "h":10, + "over":"07_jennings.svg", + "debug":false + }, + { // music (gris 50) + "x":28, + "y":84, + "w":105, + "h":48, + "over":"05_music50.svg", + "debug":false + }, + ] } ], "25":[ { "page":49, "bg":"48_Dennis.jpeg", - "overlays":[] + "overlays":[ + { // dennis + "x":76, + "y":115, + "w":48, + "h":10, + "over":"07_dennis.svg", + "debug":false + }, +] }, - {"active":false} + {"active":true} ], "28":[ { "page":55, "bg":"54_DingDong.jpeg", - "overlays":[] + "overlays":[ + { // ding dong + "x":87, + "y":122, + "w":79, + "h":10, + "over":"07_dingdong.svg", + "debug":false + }, + { // music (gris 50) + "x":63, + "y":75, + "w":105, + "h":48, + "over":"05_music50.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "29":[ { "page":57, "bg":"56_Johnson.jpeg", - "overlays":[] + "overlays":[ + { // ray j(ohnson james waring) + "x":139, + "y":96, + "w":43, + "h":10, + "over":"07_johnson.svg", + "debug":false + }, + { // ray johnson james waring + poetry + "x":181, + "y":96, + "w":35, + "h":12, + "over":"07_johnson+poetry.svg", + "debug":false + }, + { // (ray john)son (james waring) + "x":17, + "y":108, + "w":33, + "h":10, + "over":"07_johnson.svg", + "debug":false + }, + { // (ray johnson) james waring + "x":104, + "y":155, + "w":112, + "h":10, + "over":"07_johnson.svg", + "debug":false + }, + { // (p) oetry + "x":181, + "y":7, + "w":35, + "h":90, + "over":"05_poetry.svg", + "debug":false + }, + { // p (oetry) + "x":181, + "y":107, + "w":35, + "h":20, + "over":"05_poetry.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "30":[ { "page":59, "bg":"58_MacLow.jpeg", - "overlays":[] + "overlays":[ + { // maclow (80%) + "x":38, + "y":105, + "w":130, + "h":10, + "over":"07_maclow.svg", + "debug":false + }, + { // music (gris 50) + "x":42, + "y":58, + "w":106, + "h":48, + "over":"05_music50.svg", + "debug":false + }, + { // poetry + "x":147, + "y":0, + "w":35, + "h":108, + "over":"05_poetry.svg", + "debug":false + }, + { // essays + "x":181, + "y":0, + "w":35, + "h":108, + "over":"05_essays.svg", + "debug":false + }, + { // indeterminacy + "x":108, + "y":139, + "w":104, + "h":70, + "over":"04_indeterminacy.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "40":[ - {"active":false}, + {"active":true}, { "page":80, "bg":"79_Maxfield.jpeg", - "overlays":[] + "overlays":[ + { // ri(chard maxfield) + "x":191, + "y":117, + "w":20, + "h":10, + "over":"07_maxfield.svg", + "debug":false + }, + { // (ri)chard maxfield + "x":14, + "y":131, + "w":121, + "h":10, + "over":"07_maxfield.svg", + "debug":false + }, + { // essays + "x":173, + "y":9, + "w":35, + "h":108, + "over":"05_essays.svg", + "debug":false + }, + ] } ], "46":[ { "page":91, "bg":"90_Simone.jpeg", - "overlays":[] + "overlays":[ + { // simone forti + "x":70, + "y":124, + "w":50, + "h":10, + "over":"07_forti.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "47":[ { "page":93, "bg":"92_Paik.jpeg", - "overlays":[] + "overlays":[ + { // nam (june paik) + "x":185, + "y":106, + "w":28, + "h":10, + "over":"07_paik.svg", + "debug":false + }, + { // (nam) june paik + "x":17, + "y":117, + "w":80, + "h":10, + "over":"07_paik.svg", + "debug":false + }, + { // essay + "x":178, + "y":5, + "w":35, + "h":93, + "over":"05_essays.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "48":[ { "page":95, "bg":"94_Riley.jpeg", - "overlays":[] + "overlays":[ + { // terry riley + "x":99, + "y":141, + "w":103, + "h":11, + "over":"07_riley.svg", + "debug":false + }, + { // music (gris 50) + "x":30, + "y":65, + "w":105, + "h":48, + "over":"05_music50.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "50":[ - {"active":false}, + {"active":true}, { "page":100, "bg":"99_Rot.jpeg", - "overlays":[] + "overlays":[ + { // earle brown + "x":25, + "y":167, + "w":75, + "h":10, + "over":"07_rot.svg", + "debug":false + }, + { // poetry + "x":168, + "y":15, + "w":35, + "h":108, + "over":"05_poetry.svg", + "debug":false + }, + ] } ], "51":[ { "page":101, "bg":"100_Williams.jpeg", - "overlays":[] + "overlays":[ + { // emmet williams + "x":33, + "y":178, + "w":137, + "h":10, + "over":"07_williams.svg", + "debug":false + }, + { // poetry + "x":164, + "y":23, + "w":35, + "h":108, + "over":"05_poetry.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "53":[ { "page":105, "bg":"104_Wolff.jpeg", - "overlays":[] + "overlays":[ + { // christian wolff + "x":162, + "y":165, + "w":55, + "h":10, + "over":"07_wolff.svg", + "debug":false + }, + { // christian wolff + "x":17, + "y":177, + "w":79, + "h":10, + "over":"07_brown.svg", + "debug":false + }, + { // music (gris 50) + "x":43, + "y":67, + "w":105, + "h":48, + "over":"05_music50.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "55":[ { "page":109, "bg":"108_Young.jpeg", - "overlays":[] + "overlays":[ + { // la monte young + "x":96, + "y":183, + "w":122, + "h":10, + "over":"07_young.svg", + "debug":false + }, + { // compositions + "x":112, + "y":111, + "w":103, + "h":70, + "over":"05_compositions.svg", + "debug":false + }, + ] }, - {"active":false} + {"active":true} ], "56":[ { @@ -271,7 +1208,7 @@ var _ACTIVE_PAGES={ "bg":"110_StraightLine.jpeg", "overlays":[] }, - {"active":false} + {"active":true} ], "57":[ { @@ -289,8 +1226,17 @@ var _ACTIVE_PAGES={ { "page":115, "bg":"114_4couv.jpeg", - "overlays":[] + "overlays":[ + { // lettre raoul hausmann + "x":140, + "y":5, + "w":80, + "h":200, + "over":"hausmann.svg", + "debug":false + } + ] }, - {"active":false} + {"active":true} ] }; diff --git a/js/settings.js b/js/settings.js new file mode 100644 index 0000000..fd6c418 --- /dev/null +++ b/js/settings.js @@ -0,0 +1,6 @@ +var _SETTINGS={ + // global debug switch : + // - false to hide all repers + // - true to allow to diplay some repers + 'debug':true +};