Skip to content

Commit

Permalink
release 1.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
qathom committed Apr 12, 2016
1 parent fc83893 commit 51c194c
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 25 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
### 1.2.5 (2016-04-12)

#### Bug Fixes

* attempt to fix elements in header bar (which are not centered vertically) on iOS [#110](https://github.com/quark-dev/Phonon-Framework/issues/110)
* TapElement start/move when clientX/clientY is 0 throws js error [#119](https://github.com/quark-dev/Phonon-Framework/issues/119)

### 1.2.4 (2016-04-01)

#### Bug Fixes
Expand Down
2 changes: 2 additions & 0 deletions dist/css/phonon-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ button {
color: #fff;
height: 52px;
line-height: 52px;
vertical-align: middle;
}
.header-bar .center .title {
margin: 0 auto;
Expand All @@ -510,6 +511,7 @@ button {
padding: 0 12px;
height: 52px;
line-height: 52px;
vertical-align: middle;
color: #fff;
background-color: transparent;
border: none;
Expand Down
2 changes: 1 addition & 1 deletion dist/css/phonon-base.min.css

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions dist/css/phonon.css
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ button {
color: #fff;
height: 52px;
line-height: 52px;
vertical-align: middle;
}
.header-bar .center .title {
margin: 0 auto;
Expand All @@ -510,6 +511,7 @@ button {
padding: 0 12px;
height: 52px;
line-height: 52px;
vertical-align: middle;
color: #fff;
background-color: transparent;
border: none;
Expand Down
2 changes: 1 addition & 1 deletion dist/css/phonon.min.css

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dist/js/components/popovers.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
var target = evt.target, trigger = findTrigger(target);

if (trigger.target) {

var popover = document.querySelector('#'+trigger.id);

if(popover) {
Expand Down Expand Up @@ -204,7 +204,7 @@
popover.style.top = rect.top + 'px';
popover.style.left = rect.left + 'px';
}

if(!popover.classList.contains('active')) {
popover.classList.add('active');
}
Expand Down Expand Up @@ -253,7 +253,7 @@
}
};
};

window.phonon = phonon;

if(typeof exports === 'object') {
Expand All @@ -262,4 +262,4 @@
define(function() { return phonon.popover });
}

}(typeof window !== 'undefined' ? window : this, window.phonon || {}));
}(typeof window !== 'undefined' ? window : this, window.phonon || {}));
8 changes: 4 additions & 4 deletions dist/js/phonon-core.js
Original file line number Diff line number Diff line change
Expand Up @@ -478,14 +478,14 @@ phonon.event = (function () {

this.moved = false;

this.startX = e.clientX || e.touches[0].clientX;
this.startY = e.clientY || e.touches[0].clientY;
this.startX = (e.touches ? e.touches[0].clientX : e.clientX);
this.startY = (e.touches ? e.touches[0].clientY : e.clientY);
};

TapElement.prototype.move = function(e) {

var moveX = e.clientX || e.touches[0].clientX;
var moveY = e.clientY || e.touches[0].clientY;
var moveX = (e.touches ? e.touches[0].clientX : e.clientX);
var moveY = (e.touches ? e.touches[0].clientY : e.clientY);

//if finger moves more than 10px flag to cancel
if (Math.abs(moveX - this.startX) > 10 || Math.abs(moveY - this.startY) > 10) {
Expand Down
2 changes: 1 addition & 1 deletion dist/js/phonon-core.min.js

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions dist/js/phonon.js
Original file line number Diff line number Diff line change
Expand Up @@ -478,14 +478,14 @@ phonon.event = (function () {

this.moved = false;

this.startX = e.clientX || e.touches[0].clientX;
this.startY = e.clientY || e.touches[0].clientY;
this.startX = (e.touches ? e.touches[0].clientX : e.clientX);
this.startY = (e.touches ? e.touches[0].clientY : e.clientY);
};

TapElement.prototype.move = function(e) {

var moveX = e.clientX || e.touches[0].clientX;
var moveY = e.clientY || e.touches[0].clientY;
var moveX = (e.touches ? e.touches[0].clientX : e.clientX);
var moveY = (e.touches ? e.touches[0].clientY : e.clientY);

//if finger moves more than 10px flag to cancel
if (Math.abs(moveX - this.startX) > 10 || Math.abs(moveY - this.startY) > 10) {
Expand Down Expand Up @@ -3637,7 +3637,7 @@ phonon.tagManager = (function () {
var target = evt.target, trigger = findTrigger(target);

if (trigger.target) {

var popover = document.querySelector('#'+trigger.id);

if(popover) {
Expand Down Expand Up @@ -3745,7 +3745,7 @@ phonon.tagManager = (function () {
popover.style.top = rect.top + 'px';
popover.style.left = rect.left + 'px';
}

if(!popover.classList.contains('active')) {
popover.classList.add('active');
}
Expand Down Expand Up @@ -3794,7 +3794,7 @@ phonon.tagManager = (function () {
}
};
};

window.phonon = phonon;

if(typeof exports === 'object') {
Expand All @@ -3804,6 +3804,7 @@ phonon.tagManager = (function () {
}

}(typeof window !== 'undefined' ? window : this, window.phonon || {}));

/* ========================================================================
* Phonon: preloaders.js v0.0.5
* http://phonon.quarkdev.com
Expand Down
6 changes: 3 additions & 3 deletions dist/js/phonon.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/js/ui/popovers.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
var target = evt.target, trigger = findTrigger(target);

if (trigger.target) {

var popover = document.querySelector('#'+trigger.id);

if(popover) {
Expand Down Expand Up @@ -204,7 +204,7 @@
popover.style.top = rect.top + 'px';
popover.style.left = rect.left + 'px';
}

if(!popover.classList.contains('active')) {
popover.classList.add('active');
}
Expand Down Expand Up @@ -253,7 +253,7 @@
}
};
};

window.phonon = phonon;

if(typeof exports === 'object') {
Expand All @@ -262,4 +262,4 @@
define(function() { return phonon.popover });
}

}(typeof window !== 'undefined' ? window : this, window.phonon || {}));
}(typeof window !== 'undefined' ? window : this, window.phonon || {}));
2 changes: 2 additions & 0 deletions src/stylus/base/header-bars.styl
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
color header-text-color
height header-height
line-height header-height
vertical-align middle

.center
.title
Expand All @@ -60,6 +61,7 @@
padding 0 button-padding
height header-height - header-border-bottom-height
line-height header-height
vertical-align middle
color header-text-color
background-color transparent
border none
Expand Down

0 comments on commit 51c194c

Please sign in to comment.