From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 30 Mar 2018 13:40:27 +0000 (+0200)
Subject: wip #2015 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7165f47efa1d713d471bda6ad5917fc93c0416c5;p=fluidbook-html5.git

wip #2015 @0.25
---

diff --git a/images/shadows/back/left.png b/images/shadows/back/left.png
index 99e9f4cd..b19cae2a 100644
Binary files a/images/shadows/back/left.png and b/images/shadows/back/left.png differ
diff --git a/images/shadows/back/right.png b/images/shadows/back/right.png
index 2326dfba..b9556bc6 100644
Binary files a/images/shadows/back/right.png and b/images/shadows/back/right.png differ
diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index c62713c2..3ea67a1e 100644
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -319,6 +319,8 @@ FluidbookNav.prototype = {
 
         var $this = this;
 
+        var extraNPerURL = {};
+
         for (var i in thisall) {
             var icon = thisall[i];
             var visible = hide.indexOf(icon) == -1;
@@ -483,7 +485,6 @@ FluidbookNav.prototype = {
                 if ((extraVisibility == 'horizontal' && navType == 'menu') || (extraVisibility == 'burger' && navType == 'horizontalNav')) {
                     continue;
                 }
-
                 var linkIcon;
 
                 if (extraIcon.indexOf('.') === -1) {
@@ -491,18 +492,21 @@ FluidbookNav.prototype = {
                 } else {
                     if (extraIcon.indexOf('.svg') >= 0) {
                         if (getSpriteIcon('extra-extra' + n) == '') {
+                            var url = 'data/images/' + extraIcon;
+                            extraNPerURL[url] = n;
                             $.ajax({
-                                url: 'data/images/' + extraIcon,
+                                url: url,
                                 type: 'GET',
                                 dataType: 'xml',
                                 success: function (data) {
+                                    var n1 = extraNPerURL[this.url];
                                     var svg = $(data).find('svg');
                                     var viewbox = $(svg).attr('viewBox');
                                     var maing = $(svg).children('g').eq(0);
-                                    if ($("#extra-extra" + n).length == 0) {
-                                        $("#svg-container").append('<svg xmlns="http://www.w3.org/2000/svg" style="display: none;"><symbol id="extra-extra' + n + '" viewBox="' + viewbox + '">' + maing.html() + '</symbol></svg>');
+                                    if ($("#extra-extra" + n1).length == 0) {
+                                        $("#svg-container").append('<svg xmlns="http://www.w3.org/2000/svg" style="display: none;"><symbol id="extra-extra' + n1 + '" viewBox="' + viewbox + '"><g>' + $("<g/>").append($(maing).clone()).html() + '</g></symbol></svg>');
                                     }
-                                    $('#spare_extra' + n).replaceWith(getSpriteIcon('extra-extra' + n));
+                                    $('#spare_extra' + n1).replaceWith(getSpriteIcon('extra-extra' + n1));
                                 },
                             });
 
@@ -669,16 +673,6 @@ FluidbookNav.prototype = {
 
         // Bookmarks icon
         $(document).on('click', '.icon-bookmarks', function () {
-            if (!$this.fluidbook.bookmarks.hasBookmarkedPages()) {
-                var message = $this.fluidbook.l10n.__("you don't have any bookmarks");
-                if ($this.fluidbook.datas.phonegap) {
-                    navigator.notification.alert(message, function () {
-                    }, $this.fluidbook.l10n.__('bookmarks'));
-                } else {
-                    window.alert(message);
-                }
-                return false;
-            }
             if ($(this).data('extra') != null) {
                 $this.fluidbook.menu.openView('bookmark', $(this).data('extra'), null, function () {
                 });