some cleanup...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-02-01 02:14:40 +04:00
parent 4ed4617ffb
commit 6c261e4232
3 changed files with 48 additions and 77 deletions

View File

@ -1,132 +1,109 @@
<svg width="40" height="40" xmlns="http://www.w3.org/2000/svg"> <svg width="40" height="40" xmlns="http://www.w3.org/2000/svg">
<!-- Created with SVG-edit - http://svg-edit.googlecode.com/ --> <!-- Created with SVG-edit - http://svg-edit.googlecode.com/ -->
<g display="none"> <g display="none">
<title>bookmark</title> <title>bookmark</title>
<rect fill="#afafaf" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" x="8.807377" y="5.858955" width="24.052915" height="28.604868" id="svg_1" stroke="#ffffff"/> <rect stroke="#ffffff" id="svg_1" height="28.604868" width="24.052915" y="5.858955" x="8.807377" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" fill="#afafaf"/>
<path fill="#ff0000" stroke-width="0" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" d="m21.76223,3.6519l8.41658,0l0,14.510551l-4.124889,-2.792191l-4.291691,2.792191l0,-14.510551l0,0z" id="svg_4" stroke="#ffffff"/> <path stroke="#ffffff" id="svg_4" d="m21.76223,3.6519l8.41658,0l0,14.510551l-4.124889,-2.792191l-4.291691,2.792191l0,-14.510551l0,0z" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="0" fill="#ff0000"/>
</g> </g>
<g display="none"> <g display="none">
<title>next</title> <title>next</title>
<path fill="#afafaf" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m23.175751,20.13286l-8.773801,-14.25492l5.77823,0l8.77379,14.25492l-8.77379,14.254911l-5.77823,0l8.773801,-14.254911z" id="svg_11" stroke="#ffffff"/> <path stroke="#ffffff" id="svg_11" d="m23.175751,20.13286l-8.773801,-14.25492l5.77823,0l8.77379,14.25492l-8.77379,14.254911l-5.77823,0l8.773801,-14.254911z" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" fill="#afafaf"/>
</g> </g>
<g display="none"> <g display="none">
<title>prev</title> <title>prev</title>
<path fill="#afafaf" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m20.467501,20.112249l-8.77377,-14.25492l5.778199,0l8.77379,14.25492l-8.77379,14.254911l-5.778199,0l8.77377,-14.254911z" stroke="#ffffff" id="svg_13" transform="rotate(-180 18.9697 20.1122)"/> <path transform="rotate(-180 18.9697 20.1122)" id="svg_13" stroke="#ffffff" d="m20.467501,20.112249l-8.77377,-14.25492l5.778199,0l8.77379,14.25492l-8.77379,14.254911l-5.778199,0l8.77377,-14.254911z" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" fill="#afafaf"/>
</g> </g>
<g display="inline">
<g display="none">
<title>Info</title> <title>Info</title>
<g id="svg_3"> <g id="svg_6">
<circle stroke="#ffffff" id="svg_2" r="14.302816" cy="20.120354" cx="20.341617" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" fill="#000000"/> <circle fill="#000000" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" cx="20.762543" cy="20.120354" r="14.302816" id="svg_2" stroke="#ffffff"/>
<text stroke="#000000" transform="matrix(1.02694 0 0 1.02694 -0.348556 4.34707)" stroke-opacity="0" xml:space="preserve" text-anchor="middle" font-family="Sans-serif" font-size="24" id="svg_5" y="23.397665" x="19.914334" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="0" fill="#ffffff">i</text> <text fill="#ffffff" stroke-width="0" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="21.029904" y="21.833322" id="svg_5" font-size="24" font-family="Sans-serif" text-anchor="middle" xml:space="preserve" stroke-opacity="0" transform="matrix(0.894143 0 0 0.894143 1.91526 8.19192)" stroke="#000000">i</text>
</g> </g>
</g> </g>
<g display="none"> <g display="none">
<title>New Page</title> <title>New Page</title>
<g id="svg_24"> <g id="svg_24">
<g id="svg_16"> <g id="svg_16">
<g id="svg_9"> <g id="svg_9">
<circle id="svg_7" r="7.062921" cy="30.383944" cx="28.691122" fill-opacity="0" stroke="#ffffff" fill="#000000"/> <circle fill="#000000" stroke="#ffffff" fill-opacity="0" cx="28.691122" cy="30.383944" r="7.062921" id="svg_7"/>
<text stroke-opacity="0" xml:space="preserve" text-anchor="middle" font-family="serif" font-size="18" id="svg_8" y="36.267789" x="28.840151" stroke-width="0" stroke="#000000" fill="#ffffff">+</text> <text fill="#ffffff" stroke="#000000" stroke-width="0" x="28.840151" y="36.267789" id="svg_8" font-size="18" font-family="serif" text-anchor="middle" xml:space="preserve" stroke-opacity="0">+</text>
</g> </g>
<path id="svg_15" d="m22.85829,34.523949l-13.95871,0.052132l-0.06013,-28.68312l24.05293,0l-0.06015,18.82142" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="null" stroke="#ffffff" fill="none"/> <path fill="none" stroke="#ffffff" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m22.85829,34.523949l-13.95871,0.052132l-0.06013,-28.68312l24.05293,0l-0.06015,18.82142" id="svg_15"/>
</g> </g>
<text stroke-opacity="0" xml:space="preserve" text-anchor="middle" font-family="Sans-serif" font-size="12" id="svg_17" y="17.566648" x="15.281621" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="0" stroke="#000000" fill="#ffffff">P</text> <text fill="#ffffff" stroke="#000000" stroke-width="0" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="15.281621" y="17.566648" id="svg_17" font-size="12" font-family="Sans-serif" text-anchor="middle" xml:space="preserve" stroke-opacity="0">P</text>
</g> </g>
</g> </g>
<g display="none"> <g display="none">
<title>Page Right</title> <title>Page Right</title>
<g id="svg_58"> <g id="svg_58">
<g id="svg_57"> <g id="svg_57">
<path id="svg_54" d="m29.57338,34.557121l-20.69354,-0.007992l-0.06013,-28.683129l24.052929,0l-0.000019,20.86593" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="null" stroke="#ffffff" fill="none"/> <path fill="none" stroke="#ffffff" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m29.57338,34.557121l-20.69354,-0.007992l-0.06013,-28.683129l24.052929,0l-0.000019,20.86593" id="svg_54"/>
<path stroke="#ffffff" id="svg_56" fill="#000000" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m32.260822,30.336447l-4.331331,-7.037247l2.852551,0l4.331293,7.037247l-4.331293,7.037325l-2.852551,0l4.331331,-7.037325z"/> <path d="m32.260818,30.336451l-4.331329,-7.037251l2.852551,0l4.331299,7.037251l-4.331299,7.037321l-2.852551,0l4.331329,-7.037321z" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" fill="#000000" id="svg_56" stroke="#ffffff"/>
</g> </g>
<text id="svg_55" stroke-opacity="0" xml:space="preserve" text-anchor="middle" font-family="Sans-serif" font-size="12" y="17.539691" x="15.261884" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="0" stroke="#000000" fill="#ffffff">P</text> <text fill="#ffffff" stroke="#000000" stroke-width="0" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="15.261884" y="17.539691" font-size="12" font-family="Sans-serif" text-anchor="middle" xml:space="preserve" stroke-opacity="0" id="svg_55">P</text>
</g> </g>
</g> </g>
<g display="none"> <g display="none">
<title>Page Left</title> <title>Page Left</title>
<g id="svg_68"> <g id="svg_68">
<g id="svg_67"> <g id="svg_67">
<g id="svg_66"> <g id="svg_66">
<path id="svg_61" d="m28.621111,34.492619l-19.731441,0.052151l-0.06013,-28.683099l24.052921,0l-0.000011,17.4384" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="null" stroke="#ffffff" fill="none"/> <path fill="none" stroke="#ffffff" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m28.621111,34.492619l-19.731441,0.052151l-0.06013,-28.683099l24.052921,0l-0.000011,17.4384" id="svg_61"/>
<path id="svg_65" d="m32.840248,24.30146l0.05212,10.15435l-1.082397,0.060131" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="null" stroke="#ffffff" fill="none"/> <path fill="none" stroke="#ffffff" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m32.840248,24.30146l0.05212,10.15435l-1.082397,0.060131" id="svg_65"/>
</g> </g>
<path transform="rotate(180 29.8475 30.3321)" id="svg_62" stroke="#ffffff" fill="#000000" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m30.586983,30.3321l-4.331406,-7.037199l2.8526,0l4.331253,7.037199l-4.331253,7.0373l-2.8526,0l4.331406,-7.0373z"/> <path d="m30.586981,30.3321l-4.3314,-7.037199l2.852598,0l4.331251,7.037199l-4.331251,7.0373l-2.852598,0l4.3314,-7.0373z" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" fill="#000000" stroke="#ffffff" id="svg_62" transform="rotate(180 29.8475 30.3321)"/>
</g> </g>
<text id="svg_63" stroke-opacity="0" xml:space="preserve" text-anchor="middle" font-family="Sans-serif" font-size="12" y="17.535359" x="15.271712" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="0" stroke="#000000" fill="#ffffff">P</text> <text fill="#ffffff" stroke="#000000" stroke-width="0" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="15.271712" y="17.535359" font-size="12" font-family="Sans-serif" text-anchor="middle" xml:space="preserve" stroke-opacity="0" id="svg_63">P</text>
</g> </g>
</g> </g>
<g display="none"> <g display="none">
<title>New Article</title> <title>New Article</title>
<g id="svg_48"> <g id="svg_48">
<g id="svg_26"> <g id="svg_26">
<g id="svg_27"> <g id="svg_27">
<circle id="svg_28" r="7.062921" cy="30.356987" cx="28.671385" fill-opacity="0" stroke="#ffffff" fill="#000000"/> <circle fill="#000000" stroke="#ffffff" fill-opacity="0" cx="28.671385" cy="30.356987" r="7.062921" id="svg_28"/>
<text id="svg_29" stroke-opacity="0" xml:space="preserve" text-anchor="middle" font-family="serif" font-size="18" y="36.240832" x="28.820414" stroke-width="0" stroke="#000000" fill="#ffffff">+</text> <text fill="#ffffff" stroke="#000000" stroke-width="0" x="28.820414" y="36.240832" font-size="18" font-family="serif" text-anchor="middle" xml:space="preserve" stroke-opacity="0" id="svg_29">+</text>
</g> </g>
<path id="svg_30" d="m22.83856,34.496994l-13.95872,0.052132l-0.06013,-28.683123l24.052917,0l-0.06015,18.821419" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="null" stroke="#ffffff" fill="none"/> <path fill="none" stroke="#ffffff" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m22.83856,34.49699l-13.95872,0.052139l-0.06013,-28.683129l24.052921,0l-0.06015,18.82142" id="svg_30"/>
</g> </g>
<text id="svg_31" stroke-opacity="0" xml:space="preserve" text-anchor="middle" font-family="Sans-serif" font-size="12" y="17.539691" x="15.68281" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="0" stroke="#000000" fill="#ffffff">A</text> <text fill="#ffffff" stroke="#000000" stroke-width="0" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="15.68281" y="17.539691" font-size="12" font-family="Sans-serif" text-anchor="middle" xml:space="preserve" stroke-opacity="0" id="svg_31">A</text>
</g> </g>
</g> </g>
<g display="none"> <g display="none">
<title>Article Left</title> <title>Article Left</title>
<g id="svg_76"> <g id="svg_76">
<g id="svg_70"> <g id="svg_70">
<g id="svg_71"> <g id="svg_71">
<path id="svg_72" d="m28.621141,34.492653l-19.731458,0.052151l-0.060129,-28.683064l24.052911,0l-0.000011,17.438417" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="null" stroke="#ffffff" fill="none"/> <path fill="none" stroke="#ffffff" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m28.62114,34.492649l-19.73146,0.052151l-0.06013,-28.68306l24.052919,0l-0.000019,17.438419" id="svg_72"/>
<path id="svg_73" d="m32.840252,24.301548l0.05212,10.154297l-1.082371,0.060131" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="null" stroke="#ffffff" fill="none"/> <path fill="none" stroke="#ffffff" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m32.840248,24.30155l0.05212,10.154291l-1.082369,0.060139" id="svg_73"/>
</g> </g>
<path id="svg_74" transform="rotate(180 29.8475 30.3322)" stroke="#ffffff" fill="#000000" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m30.587011,30.332188l-4.3314,-7.037199l2.852598,0l4.331213,7.037199l-4.331213,7.037247l-2.852598,0l4.3314,-7.037247z"/> <path d="m30.587009,30.33219l-4.3314,-7.037199l2.8526,0l4.331209,7.037199l-4.331209,7.037241l-2.8526,0l4.3314,-7.037241z" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" fill="#000000" stroke="#ffffff" transform="rotate(180 29.8475 30.3322)" id="svg_74"/>
</g> </g>
<text id="svg_75" stroke-opacity="0" xml:space="preserve" text-anchor="middle" font-family="Sans-serif" font-size="12" y="17.535428" x="15.692654" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="0" stroke="#000000" fill="#ffffff">A</text> <text fill="#ffffff" stroke="#000000" stroke-width="0" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="15.692654" y="17.535428" font-size="12" font-family="Sans-serif" text-anchor="middle" xml:space="preserve" stroke-opacity="0" id="svg_75">A</text>
</g> </g>
</g> </g>
<g display="none"> <g display="none">
<title>Article Right</title> <title>Article Right</title>
<g id="svg_89"> <g id="svg_89">
<g id="svg_85"> <g id="svg_85">
<path id="svg_86" d="m29.583231,34.612888l-20.693563,-0.007992l-0.060131,-28.683093l24.052925,0l-0.000019,20.865946" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="null" stroke="#ffffff" fill="none"/> <path fill="none" stroke="#ffffff" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m29.583229,34.612888l-20.693559,-0.007988l-0.06013,-28.6831l24.052921,0l-0.000023,20.86595" id="svg_86"/>
<path id="svg_87" stroke="#ffffff" fill="#000000" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m32.27066,30.392271l-4.33132,-7.037251l2.852551,0l4.331224,7.037251l-4.331224,7.037268l-2.852551,0l4.33132,-7.037268z"/> <path d="m32.27066,30.392269l-4.33132,-7.037249l2.852549,0l4.33123,7.037249l-4.33123,7.03727l-2.852549,0l4.33132,-7.03727z" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" fill="#000000" stroke="#ffffff" id="svg_87"/>
</g> </g>
<text id="svg_88" stroke-opacity="0" xml:space="preserve" text-anchor="middle" font-family="Sans-serif" font-size="12" y="17.595492" x="15.692638" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="0" stroke="#000000" fill="#ffffff">A</text> <text fill="#ffffff" stroke="#000000" stroke-width="0" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="15.692638" y="17.595492" font-size="12" font-family="Sans-serif" text-anchor="middle" xml:space="preserve" stroke-opacity="0" id="svg_88">A</text>
</g> </g>
</g> </g>
<g display="none"> <g display="none">
<title>New Magazine</title> <title>New Magazine</title>
<g id="svg_47"> <g id="svg_47">
<g id="svg_33"> <g id="svg_33">
<g id="svg_34"> <g id="svg_34">
<circle id="svg_35" r="7.062921" cy="30.356987" cx="28.671385" fill-opacity="0" stroke="#ffffff" fill="#000000"/> <circle fill="#000000" stroke="#ffffff" fill-opacity="0" cx="28.671385" cy="30.356987" r="7.062921" id="svg_35"/>
<text id="svg_36" stroke-opacity="0" xml:space="preserve" text-anchor="middle" font-family="serif" font-size="18" y="36.240832" x="28.820414" stroke-width="0" stroke="#000000" fill="#ffffff">+</text> <text fill="#ffffff" stroke="#000000" stroke-width="0" x="28.820414" y="36.240832" font-size="18" font-family="serif" text-anchor="middle" xml:space="preserve" stroke-opacity="0" id="svg_36">+</text>
</g> </g>
<path id="svg_37" d="m22.8386,34.497002l-13.95876,0.052097l-0.06013,-28.683099l24.052891,0l-0.060101,18.821401" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="null" stroke="#ffffff" fill="none"/> <path fill="none" stroke="#ffffff" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" d="m22.8386,34.497002l-13.95876,0.052097l-0.06013,-28.683099l24.052891,0l-0.060101,18.821401" id="svg_37"/>
</g> </g>
<text id="svg_38" stroke-opacity="0" xml:space="preserve" text-anchor="middle" font-family="Sans-serif" font-size="12" y="17.539691" x="15.923339" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="0" stroke="#000000" fill="#ffffff">M</text> <text fill="#ffffff" stroke="#000000" stroke-width="0" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="15.923339" y="17.539691" font-size="12" font-family="Sans-serif" text-anchor="middle" xml:space="preserve" stroke-opacity="0" id="svg_38">M</text>
</g> </g>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

View File

@ -192,9 +192,9 @@ $(document).ready(function(){
<svg width="40" height="40" xmlns="http://www.w3.org/2000/svg"> <svg width="40" height="40" xmlns="http://www.w3.org/2000/svg">
<g> <g>
<title>Info</title> <title>Info</title>
<g id="svg_3"> <g id="svg_6">
<circle fill="#000000" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" cx="20.341617" cy="20.120354" r="14.302816" id="svg_2" stroke="#ffffff"/> <circle fill="#000000" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" cx="20.762543" cy="20.120354" r="14.302816" id="svg_2" stroke="#ffffff"/>
<text fill="#ffffff" stroke-width="0" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="19.914334" y="23.397665" id="svg_5" font-size="24" font-family="Sans-serif" text-anchor="middle" xml:space="preserve" stroke-opacity="0" transform="matrix(1.02694 0 0 1.02694 -0.348556 4.34707)" stroke="#000000">i</text> <text fill="#ffffff" stroke-width="0" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="21.029904" y="21.833322" id="svg_5" font-size="24" font-family="Sans-serif" text-anchor="middle" xml:space="preserve" stroke-opacity="0" transform="matrix(0.894143 0 0 0.894143 1.91526 8.19192)" stroke="#000000">i</text>
</g> </g>
</g> </g>
</svg> </svg>

View File

@ -447,7 +447,6 @@ function prevArticle(){
/******************************************************* bookmarks ***/ /******************************************************* bookmarks ***/
// setup bookmarking active zones in page... // setup bookmarking active zones in page...
// XXX make this attach to page instead of it's number number...
function setupBookmarkTouchZones(){ function setupBookmarkTouchZones(){
$('.bookmark-toggler').remove() $('.bookmark-toggler').remove()
var page = $('.page') var page = $('.page')
@ -547,7 +546,9 @@ function prevBookmark(){
// NOTE: the navigator is not live and will need to get regenerated on // NOTE: the navigator is not live and will need to get regenerated on
// each magazine edit... // each magazine edit...
// XXX make this attach to page instead of it's number number... // NOTE: article indicators will be regenirated on magazine structure
// change, so there is no use of linking to actual pages.
// ...no need in making this live.
function makeArticleIndicator(i, article, width){ function makeArticleIndicator(i, article, width){
var bar = $('.navigator .bar') var bar = $('.navigator .bar')
var article = $(article) var article = $(article)
@ -612,8 +613,8 @@ function setupNavigator(){
.on('magazineDragging', function(){updateNavigator()}) .on('magazineDragging', function(){updateNavigator()})
} }
// XXX this needs to unbind events...
function clearNavigator(){ function clearNavigator(){
// XXX this needs to unbind events...
$('.navigator .indicator').hide() $('.navigator .indicator').hide()
clearBookmarkIndicators() clearBookmarkIndicators()
clearArticleIndicators() clearArticleIndicators()
@ -700,7 +701,9 @@ function updatePageNumberIndicator(){
/*********************************************************** state ***/ /*********************************************************** state ***/
// XXX make these magazine-specific... // XXX make URLs magazine-specific...
// ...for extrnal linking we'll need the magazine ID, or make each
// magazine a seporate path...
// XXX BUG: if the hash url part coresponds to a real anchor the browser // XXX BUG: if the hash url part coresponds to a real anchor the browser
// shifts the page, need to disable this... // shifts the page, need to disable this...
// URL state managers... // URL state managers...
@ -1026,7 +1029,6 @@ function loadMagazineData(mag){
function loadMagazineChrome(position, bookmarks){ function loadMagazineChrome(position, bookmarks){
setupBookmarkTouchZones() setupBookmarkTouchZones()
setupNavigator() setupNavigator()
// XXX is this the right place for this?
setCurrentPage(position) setCurrentPage(position)
loadBookmarks(bookmarks != null ? bookmarks : []) loadBookmarks(bookmarks != null ? bookmarks : [])
} }
@ -1041,11 +1043,6 @@ function loadMagazine(mag, position, bookmarks){
} }
// XXX create magazine...
// - magazine
// - cover
// - article
// - cover
function createBaseMagazine(title, cover, article){ function createBaseMagazine(title, cover, article){
removeMagazine() removeMagazine()
var mag = loadMagazine(createMagazine(title, cover, article)) var mag = loadMagazine(createMagazine(title, cover, article))
@ -1056,6 +1053,8 @@ function createBaseMagazine(title, cover, article){
// XXX some things get really surprized when this is called, make things // XXX some things get really surprized when this is called, make things
// work with the mag cleared... // work with the mag cleared...
// XXX do we need to clear the event handlers here? // XXX do we need to clear the event handlers here?
// ...this mostly concerns bookmarking and how jQuery handles events
// on removed elements -- unbind and remove or just forget about it?
function removeMagazine(){ function removeMagazine(){
$('.magazine').remove() $('.magazine').remove()
clearNavigator() clearNavigator()
@ -1065,9 +1064,7 @@ function removeMagazine(){
/************************************************* editor: article ***/ /************************************************* editor: article ***/
// XXX create article (magazine, title, position)... // XXX create article...
// - article
// - cover
function createArticleBefore(article, title){ function createArticleBefore(article, title){
if(article == null){ if(article == null){
article = $('.current.page').parents('.article') article = $('.current.page').parents('.article')
@ -1118,9 +1115,6 @@ function removeArticle(article){
/*************************************************** editor: pages ***/ /*************************************************** editor: pages ***/
// XXX create page (article, template, position)...
// - page
// - content
function createPageIn(article, template){ function createPageIn(article, template){
if(article == null){ if(article == null){
article = $('.current.page').parents('.article') article = $('.current.page').parents('.article')