5.0.0-beta.6 release

framework7io · Aug 18, 2019 · adbe914 · adbe914
1 parent 32b32df
commit adbe914
Show file tree

Hide file tree

Showing 33 changed files with 53 additions and 37 deletions.
diff --git a/packages/core/components/photo-browser.js b/packages/core/components/photo-browser.js
diff --git a/packages/core/components/photo-browser/photo-browser-class.js b/packages/core/components/photo-browser/photo-browser-class.js
@@ -73,8 +73,10 @@ class PhotoBrowser extends Framework7Class {
         $totalEl = $(navbarEl).find('.photo-browser-total');
       }
     }
-    $currentEl.text(current);
-    $totalEl.text(total);
+    if ($currentEl.length && $totalEl.length) {
+      $currentEl.text(current);
+      $totalEl.text(total);
+    }
 
     // Update captions
     if (pb.captions.length > 0) {
@@ -167,6 +169,8 @@ class PhotoBrowser extends Framework7Class {
 
     const backLinkText = (pb.app.theme === 'ios' || pb.app.theme === 'aurora') && pb.params.backLinkText ? pb.params.backLinkText : '';
 
+    const renderNavbarCount = typeof pb.params.navbarShowCount === 'undefined' ? pb.params.photos.length > 0 : pb.params.navbarShowCount;
+
     const isPopup = pb.params.type !== 'page';
     const navbarHtml = `
       <div class="navbar navbar-photo-browser ${pb.params.theme === 'dark' ? 'navbar-photo-browser-dark' : ''}">
@@ -178,11 +182,13 @@ class PhotoBrowser extends Framework7Class {
               ${backLinkText ? `<span>${backLinkText}</span>` : ''}
             </a>
           </div>
+          ${renderNavbarCount ? `
           <div class="title">
             <span class="photo-browser-current"></span>
             <span class="photo-browser-of">${pb.params.navbarOfText}</span>
             <span class="photo-browser-total"></span>
           </div>
+          ` : ''}
           <div class="right"></div>
         </div>
       </div>

diff --git a/packages/core/components/photo-browser/photo-browser.d.ts b/packages/core/components/photo-browser/photo-browser.d.ts
@@ -40,6 +40,8 @@ export namespace PhotoBrowser {
     backLinkText?: string
     /** Text of "of" in photos counter: "3 of 5" (default "of") */
     navbarOfText?: string
+    /** Defines should it display "3 of 5" text in navbar title or not. If not specified (undefined) then it will show this text if there is more than 1 item  */
+    navbarShowCount?: boolean | undefined
     /** One of the default colors */
     iconsColor?: string
     /** Swiper parameters */

diff --git a/packages/core/components/photo-browser/photo-browser.js b/packages/core/components/photo-browser/photo-browser.js
@@ -17,6 +17,7 @@ export default {
       swipeToClose: true,
       backLinkText: 'Close',
       navbarOfText: 'of',
+      navbarShowCount: undefined,
       view: undefined,
       url: 'photos/',
       routableModals: true,

diff --git a/packages/core/components/popup.js b/packages/core/components/popup.js
diff --git a/packages/core/components/popup/popup-class.js b/packages/core/components/popup/popup-class.js
@@ -159,6 +159,7 @@ class Popup extends Modal {
 
       if (typeof popup.params.swipeToClose === 'string' && direction !== popup.params.swipeToClose) {
         $el.transform('');
+        $el.transition('');
         return;
       }
 

diff --git a/packages/core/css/framework7.bundle.css b/packages/core/css/framework7.bundle.css
@@ -1,5 +1,5 @@
 /**
- * Framework7 5.0.0-beta.5
+ * Framework7 5.0.0-beta.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/css/framework7.bundle.min.css b/packages/core/css/framework7.bundle.min.css
diff --git a/packages/core/css/framework7.bundle.rtl.css b/packages/core/css/framework7.bundle.rtl.css
@@ -1,5 +1,5 @@
 /**
- * Framework7 5.0.0-beta.5
+ * Framework7 5.0.0-beta.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/css/framework7.bundle.rtl.min.css b/packages/core/css/framework7.bundle.rtl.min.css
diff --git a/packages/core/css/framework7.css b/packages/core/css/framework7.css
@@ -1,5 +1,5 @@
 /**
- * Framework7 5.0.0-beta.5
+ * Framework7 5.0.0-beta.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/css/framework7.min.css b/packages/core/css/framework7.min.css
diff --git a/packages/core/css/framework7.rtl.css b/packages/core/css/framework7.rtl.css
@@ -1,5 +1,5 @@
 /**
- * Framework7 5.0.0-beta.5
+ * Framework7 5.0.0-beta.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/css/framework7.rtl.min.css b/packages/core/css/framework7.rtl.min.css
diff --git a/packages/core/framework7.bundle.less b/packages/core/framework7.bundle.less
@@ -1,5 +1,5 @@
 /**
- * Framework7 5.0.0-beta.5
+ * Framework7 5.0.0-beta.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/framework7.esm.bundle.js b/packages/core/framework7.esm.bundle.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 5.0.0-beta.5
+ * Framework7 5.0.0-beta.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/framework7.esm.js b/packages/core/framework7.esm.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 5.0.0-beta.5
+ * Framework7 5.0.0-beta.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/framework7.less b/packages/core/framework7.less
@@ -1,5 +1,5 @@
 /**
- * Framework7 5.0.0-beta.5
+ * Framework7 5.0.0-beta.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/js/framework7.bundle.js b/packages/core/js/framework7.bundle.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 5.0.0-beta.5
+ * Framework7 5.0.0-beta.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *
@@ -14002,6 +14002,7 @@
 
         if (typeof popup.params.swipeToClose === 'string' && direction !== popup.params.swipeToClose) {
           $el.transform('');
+          $el.transition('');
           return;
         }
 
@@ -35001,8 +35002,10 @@
           $totalEl = $(navbarEl).find('.photo-browser-total');
         }
       }
-      $currentEl.text(current);
-      $totalEl.text(total);
+      if ($currentEl.length && $totalEl.length) {
+        $currentEl.text(current);
+        $totalEl.text(total);
+      }
 
       // Update captions
       if (pb.captions.length > 0) {
@@ -35095,8 +35098,10 @@
 
       var backLinkText = (pb.app.theme === 'ios' || pb.app.theme === 'aurora') && pb.params.backLinkText ? pb.params.backLinkText : '';
 
+      var renderNavbarCount = typeof pb.params.navbarShowCount === 'undefined' ? pb.params.photos.length > 0 : pb.params.navbarShowCount;
+
       var isPopup = pb.params.type !== 'page';
-      var navbarHtml = ("\n      <div class=\"navbar navbar-photo-browser " + (pb.params.theme === 'dark' ? 'navbar-photo-browser-dark' : '') + "\">\n        <div class=\"navbar-bg\"></div>\n        <div class=\"navbar-inner sliding\">\n          <div class=\"left\">\n            <a class=\"link " + (isPopup ? 'popup-close' : '') + " " + (!backLinkText ? 'icon-only' : '') + " " + (!isPopup ? 'back' : '') + "\" " + (isPopup ? 'data-popup=".photo-browser-popup"' : '') + ">\n              <i class=\"icon icon-back " + (iconsColor ? ("color-" + iconsColor) : '') + "\"></i>\n              " + (backLinkText ? ("<span>" + backLinkText + "</span>") : '') + "\n            </a>\n          </div>\n          <div class=\"title\">\n            <span class=\"photo-browser-current\"></span>\n            <span class=\"photo-browser-of\">" + (pb.params.navbarOfText) + "</span>\n            <span class=\"photo-browser-total\"></span>\n          </div>\n          <div class=\"right\"></div>\n        </div>\n      </div>\n    ").trim();
+      var navbarHtml = ("\n      <div class=\"navbar navbar-photo-browser " + (pb.params.theme === 'dark' ? 'navbar-photo-browser-dark' : '') + "\">\n        <div class=\"navbar-bg\"></div>\n        <div class=\"navbar-inner sliding\">\n          <div class=\"left\">\n            <a class=\"link " + (isPopup ? 'popup-close' : '') + " " + (!backLinkText ? 'icon-only' : '') + " " + (!isPopup ? 'back' : '') + "\" " + (isPopup ? 'data-popup=".photo-browser-popup"' : '') + ">\n              <i class=\"icon icon-back " + (iconsColor ? ("color-" + iconsColor) : '') + "\"></i>\n              " + (backLinkText ? ("<span>" + backLinkText + "</span>") : '') + "\n            </a>\n          </div>\n          " + (renderNavbarCount ? ("\n          <div class=\"title\">\n            <span class=\"photo-browser-current\"></span>\n            <span class=\"photo-browser-of\">" + (pb.params.navbarOfText) + "</span>\n            <span class=\"photo-browser-total\"></span>\n          </div>\n          ") : '') + "\n          <div class=\"right\"></div>\n        </div>\n      </div>\n    ").trim();
       return navbarHtml;
     };
 
@@ -35564,6 +35569,7 @@
         swipeToClose: true,
         backLinkText: 'Close',
         navbarOfText: 'of',
+        navbarShowCount: undefined,
         view: undefined,
         url: 'photos/',
         routableModals: true,

diff --git a/packages/core/js/framework7.bundle.min.js b/packages/core/js/framework7.bundle.min.js
diff --git a/packages/core/js/framework7.bundle.min.js.map b/packages/core/js/framework7.bundle.min.js.map
diff --git a/packages/core/js/framework7.js b/packages/core/js/framework7.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 5.0.0-beta.5
+ * Framework7 5.0.0-beta.6
  * Full featured mobile HTML framework for building iOS & Android apps
  * http://framework7.io/
  *

diff --git a/packages/core/js/framework7.min.js b/packages/core/js/framework7.min.js
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework7",
-  "version": "5.0.0-beta.5",
+  "version": "5.0.0-beta.6",
   "description": "Full featured mobile HTML framework for building iOS & Android apps",
   "main": "js/framework7.js",
   "typings": "js/framework7.d.ts",

diff --git a/packages/react/framework7-react.bundle.js b/packages/react/framework7-react.bundle.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 React 5.0.0-beta.5
+ * Framework7 React 5.0.0-beta.6
  * Build full featured iOS & Android apps using Framework7 & React
  * http://framework7.io/react/
  *
@@ -14019,7 +14019,7 @@
   };
 
   /**
-   * Framework7 React 5.0.0-beta.5
+   * Framework7 React 5.0.0-beta.6
    * Build full featured iOS & Android apps using Framework7 & React
    * http://framework7.io/react/
    *

diff --git a/packages/react/framework7-react.bundle.min.js b/packages/react/framework7-react.bundle.min.js
diff --git a/packages/react/framework7-react.esm.js b/packages/react/framework7-react.esm.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 React 5.0.0-beta.5
+ * Framework7 React 5.0.0-beta.6
  * Build full featured iOS & Android apps using Framework7 & React
  * http://framework7.io/react/
  *

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework7-react",
-  "version": "5.0.0-beta.5",
+  "version": "5.0.0-beta.6",
   "description": "Build full featured iOS & Android apps using Framework7 & React",
   "main": "framework7-react.bundle.js",
   "typings": "framework7-react.d.ts",

diff --git a/packages/vue/framework7-vue.bundle.js b/packages/vue/framework7-vue.bundle.js
@@ -1,5 +1,5 @@
 /**
- * Framework7 Vue 5.0.0-beta.5
+ * Framework7 Vue 5.0.0-beta.6
  * Build full featured iOS & Android apps using Framework7 & Vue
  * http://framework7.io/vue/
  *
@@ -12513,7 +12513,7 @@
   };
 
   /**
-   * Framework7 Vue 5.0.0-beta.5
+   * Framework7 Vue 5.0.0-beta.6
    * Build full featured iOS & Android apps using Framework7 & Vue
    * http://framework7.io/vue/
    *