Permalink
Browse files

1.3.1 Release

  • Loading branch information...
1 parent 65a3b42 commit f1dec7bbb0254fbe07a6e43b0aac4c9cf74d6004 @nolimits4web committed Oct 12, 2015
View
@@ -1,5 +1,9 @@
# Change Log
+## Framework7 v1.3.1 - Updated on October 12, 2015
+ * Fixed issue with not showing "Cancel" button in Searchbar
+ * Fixed issue with Modal without buttons (liek Preloader modal)
+
## Framework7 v1.3.0 - Updated on October 10, 2015
* iOS Theme
* New appearence to match new iOS 9 design, mostly for Overlays: Modal, Popover and Action Sheet
View
@@ -5,7 +5,7 @@
"url": "https://github.com/nolimits4web/Framework7.git"
},
"description": "Full Featured Mobile HTML Framework For Building iOS & Android Apps",
- "version": "1.3.0",
+ "version": "1.3.1",
"author": "Vladimir Kharlampidi",
"homepage": "http://www.idangero.us/framework7",
"keywords": ["mobile", "framework", "ios 7", "ios7", "ios8", "ios 8", "iphone", "ipad", "apple", "phonegap", "native", "touch", "appstore", "app", "f7", "material", "android", "google", "googleplay"],
@@ -1,5 +1,5 @@
/**
- * Framework7 1.3.0
+ * Framework7 1.3.1
* Full Featured Mobile HTML Framework For Building iOS & Android Apps
*
* iOS Theme
@@ -12,7 +12,7 @@
*
* Licensed under MIT
*
- * Released on: October 10, 2015
+ * Released on: October 12, 2015
*/
/*==========================
Framework7 Color Themes
Oops, something went wrong.
@@ -1,5 +1,5 @@
/**
- * Framework7 1.3.0
+ * Framework7 1.3.1
* Full Featured Mobile HTML Framework For Building iOS & Android Apps
*
* iOS Theme
@@ -12,7 +12,7 @@
*
* Licensed under MIT
*
- * Released on: October 10, 2015
+ * Released on: October 12, 2015
*/
html,
body {
Oops, something went wrong.
@@ -1,5 +1,5 @@
/**
- * Framework7 1.3.0
+ * Framework7 1.3.1
* Full Featured Mobile HTML Framework For Building iOS & Android Apps
*
* iOS Theme
@@ -12,7 +12,7 @@
*
* Licensed under MIT
*
- * Released on: October 10, 2015
+ * Released on: October 12, 2015
*/
/*=============
Framework 7 RTL Additions
Oops, something went wrong.
@@ -1,5 +1,5 @@
/**
- * Framework7 1.3.0
+ * Framework7 1.3.1
* Full Featured Mobile HTML Framework For Building iOS & Android Apps
*
* Google Material Theme
@@ -12,7 +12,7 @@
*
* Licensed under MIT
*
- * Released on: October 10, 2015
+ * Released on: October 12, 2015
*/
/*==========================
Framework7 Layouts Themes
Oops, something went wrong.
@@ -1,5 +1,5 @@
/**
- * Framework7 1.3.0
+ * Framework7 1.3.1
* Full Featured Mobile HTML Framework For Building iOS & Android Apps
*
* Google Material Theme
@@ -12,7 +12,7 @@
*
* Licensed under MIT
*
- * Released on: October 10, 2015
+ * Released on: October 12, 2015
*/
html,
body {
@@ -1686,6 +1686,7 @@ i.icon.icon-prev {
i.icon.icon-plus {
width: 24px;
height: 24px;
+ font-size: 0;
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20fill%3D'%23FFFFFF'%20height%3D'24'%20viewBox%3D'0%200%2024%2024'%20width%3D'24'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M19%2013h-6v6h-2v-6H5v-2h6V5h2v6h6v2z'%2F%3E%3Cpath%20d%3D'M0%200h24v24H0z'%20fill%3D'none'%2F%3E%3C%2Fsvg%3E");
}
.badge {
Oops, something went wrong.
@@ -1,5 +1,5 @@
/**
- * Framework7 1.3.0
+ * Framework7 1.3.1
* Full Featured Mobile HTML Framework For Building iOS & Android Apps
*
* Google Material Theme
@@ -12,7 +12,7 @@
*
* Licensed under MIT
*
- * Released on: October 10, 2015
+ * Released on: October 12, 2015
*/
/*=============
Framework 7 RTL Additions
Oops, something went wrong.
View
@@ -1,5 +1,5 @@
/**
- * Framework7 1.3.0
+ * Framework7 1.3.1
* Full Featured Mobile HTML Framework For Building iOS & Android Apps
*
* http://www.idangero.us/framework7
@@ -10,7 +10,7 @@
*
* Licensed under MIT
*
- * Released on: October 10, 2015
+ * Released on: October 12, 2015
*/
(function () {
@@ -23,7 +23,7 @@
var app = this;
// Version
- app.version = '1.3.0';
+ app.version = '1.3.1';
// Default Parameters
app.params = {
@@ -1191,23 +1191,14 @@
// Set Cancel button
var cancelMarginProp = app.rtl ? 'margin-left' : 'margin-right';
- var cancelButtonHidden = false;
- s.setCancelButton = function () {
+ var cancelButtonHasMargin = false;
+ s.setCancelButtonMargin = function () {
s.cancelButton.transition(0).show();
s.cancelButton.css(cancelMarginProp, -s.cancelButton[0].offsetWidth + 'px');
- setTimeout(function () {
- s.cancelButton.transition('');
- }, 0);
+ var clientLeft = s.cancelButton[0].clientLeft;
+ s.cancelButton.transition('');
+ cancelButtonHasMargin = true;
};
- if (s.cancelButton.length > 0 && !s.material) {
- // s.cancelButton.show();
- if (s.cancelButton[0].offsetWidth) {
- s.setCancelButton();
- }
- else {
- cancelButtonHidden = true;
- }
- }
// Trigger
s.triggerEvent = function (eventName, callbackName, eventData) {
@@ -1222,6 +1213,9 @@
if ((s.searchList.length || s.params.customSearch) && !s.container.hasClass('searchbar-active')) s.overlay.addClass('searchbar-overlay-active');
s.container.addClass('searchbar-active');
if (s.cancelButton.length > 0 && !s.material) {
+ if (!cancelButtonHasMargin) {
+ s.setCancelButtonMargin();
+ }
s.cancelButton.css(cancelMarginProp, '0px');
}
s.triggerEvent('enableSearch', 'onEnable');
@@ -1411,15 +1405,6 @@
s.input[method]('focus', s.enable);
s.input[method]('change keydown keypress keyup', s.handleInput);
s.clearButton[method]('click', s.clear);
- if (cancelButtonHidden) {
- if (destroy) {
- s.container.parents('.tab').eq(0).off('show', s.setCancelButton);
- }
- else {
- s.container.parents('.tab').eq(0).once('show', s.setCancelButton);
- }
- }
-
};
s.detachEvents = function() {
@@ -3166,7 +3151,8 @@
var afterTextHTML = params.afterText ? params.afterText : '';
var noButtons = !params.buttons || params.buttons.length === 0 ? 'modal-no-buttons' : '';
var verticalButtons = params.verticalButtons ? 'modal-buttons-vertical': '';
- modalHTML = '<div class="modal ' + noButtons + ' ' + (params.cssClass || '') + '"><div class="modal-inner">' + (titleHTML + textHTML + afterTextHTML) + '</div><div class="modal-buttons modal-buttons-' + params.buttons.length + ' ' + verticalButtons + '">' + buttonsHTML + '</div></div>';
+ var modalButtonsHTML = params.buttons && params.buttons.length > 0 ? '<div class="modal-buttons modal-buttons-' + params.buttons.length + ' ' + verticalButtons + '">' + buttonsHTML + '</div>' : '';
+ modalHTML = '<div class="modal ' + noButtons + ' ' + (params.cssClass || '') + '"><div class="modal-inner">' + (titleHTML + textHTML + afterTextHTML) + '</div>' + modalButtonsHTML + '</div>';
}
_modalTemplateTempDiv.innerHTML = modalHTML;
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
View
@@ -1,6 +1,6 @@
{
"name": "framework7",
- "version": "1.3.0",
+ "version": "1.3.1",
"description": "Full Featured Mobile HTML Framework For Building iOS & Android Apps",
"main": "dist/js/framework7.js",
"repository": {
View
@@ -7,7 +7,7 @@ window.Framework7 = function (params) {
var app = this;
// Version
- app.version = '1.3.0';
+ app.version = '1.3.1';
// Default Parameters
app.params = {

0 comments on commit f1dec7b

Please sign in to comment.