Skip to content

Commit

Permalink
phonon 1.4.4, fixed #44, #46 and #52
Browse files Browse the repository at this point in the history
  • Loading branch information
qathom committed Dec 20, 2015
1 parent ba39be8 commit a7eae58
Show file tree
Hide file tree
Showing 24 changed files with 204 additions and 121 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
### 1.1.4 (2015-12-20)

#### Bug Fixes

* strange horizontal scroll with side panels on Android 5+ [#44](https://github.com/quark-dev/Phonon-Framework/issues/44)
* progress bar are not showing sometimes in notifications [#46](https://github.com/quark-dev/Phonon-Framework/issues/46)
* events inside tabs are not working (on create callback) [#52](https://github.com/quark-dev/Phonon-Framework/issues/52)

### 1.1.3 (2015-12-06)

#### Bug Fixes
Expand Down
3 changes: 3 additions & 0 deletions dist/css/components/side-panels.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
background-color: #333;
transition: width 0.3s ease;
}
.side-panel .list {
overflow-y: auto;
}
.side-panel .list li {
border-color: #444;
}
Expand Down
2 changes: 1 addition & 1 deletion dist/css/components/side-panels.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions dist/css/phonon-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,14 @@ th {
*:after {
box-sizing: border-box;
}
html,
body {
position: relative;
height: 100%;
width: 100%;
overflow-x: hidden;
}
html {
overflow: hidden;
-ms-touch-action: pan-y;
touch-action: pan-y;
}
Expand All @@ -171,7 +177,6 @@ body {
right: 0;
bottom: 0;
left: 0;
overflow: hidden;
margin: 0;
padding: 0;
word-wrap: break-word;
Expand Down
2 changes: 1 addition & 1 deletion dist/css/phonon-base.min.css

Large diffs are not rendered by default.

12 changes: 10 additions & 2 deletions dist/css/phonon.css
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,14 @@ th {
*:after {
box-sizing: border-box;
}
html,
body {
position: relative;
height: 100%;
width: 100%;
overflow-x: hidden;
}
html {
overflow: hidden;
-ms-touch-action: pan-y;
touch-action: pan-y;
}
Expand All @@ -171,7 +177,6 @@ body {
right: 0;
bottom: 0;
left: 0;
overflow: hidden;
margin: 0;
padding: 0;
word-wrap: break-word;
Expand Down Expand Up @@ -1548,6 +1553,9 @@ table,
background-color: #333;
transition: width 0.3s ease;
}
.side-panel .list {
overflow-y: auto;
}
.side-panel .list li {
border-color: #444;
}
Expand Down
2 changes: 1 addition & 1 deletion dist/css/phonon.min.css

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions dist/js/components/notifications.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

window.setTimeout(function() {
hide(self);
}, timeout);
}, parseInt(timeout));
}
}

Expand All @@ -54,7 +54,7 @@

// reset
self.style.zIndex = 18;

var height = self.clientHeight;

// for the notif
Expand Down Expand Up @@ -102,7 +102,7 @@
}
return -1;
}

var getNotification = function(target) {
for (; target && target !== document; target = target.parentNode) {
if(target.classList.contains('notification')) {
Expand All @@ -115,10 +115,10 @@
if(typeof text !== 'string') text = '';
timeout = (typeof timeout === 'number' ? timeout : 5000);

var progress = '<div class="progress"><div class="determinate"></div></div>';
var btn = (showButton === true ? '<button class="btn pull-right" data-hide-notif="true">CANCEL</button>' : '');
var progress = '<div class="progress"><div class="determinate"></div></div>';
var btn = (showButton === true ? '<button class="btn pull-right" data-hide-notif="true">CANCEL</button>' : '');

var div = document.createElement('div');
var div = document.createElement('div');
div.setAttribute('class', 'notification');
div.setAttribute('data-autodestroy', 'true');
if(timeout) div.setAttribute('data-timeout', timeout);
Expand Down Expand Up @@ -150,11 +150,11 @@
if(!notification.classList.contains('show')) {
notification.classList.add('show');

// Fix animation
// Fix animation
notification.style.zIndex = (18 + notifs.length);

// Fix space

var value = 0;
if(notifs.length > 0) {
var lastNotif = notifs[notifs.length - 1];
Expand Down Expand Up @@ -187,7 +187,7 @@
if(notification.classList.contains('show')) {

notification.classList.remove('show');

notification.on(phonon.event.transitionEnd, onHide, false);

// put floating actions back in their place
Expand All @@ -210,7 +210,7 @@
var nBuild = buildNotif(text, timeout, showButton);
window.setTimeout(function() {
show(document.querySelector('#'+nBuild.id));
}, 1);
}, 10);
return;
}

Expand All @@ -237,4 +237,4 @@
define(function() { return phonon.notif });
}

}(typeof window !== 'undefined' ? window : this, window.phonon || {}));
}(typeof window !== 'undefined' ? window : this, window.phonon || {}));
2 changes: 1 addition & 1 deletion dist/js/components/notifications.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions dist/js/components/side-panels.js
Original file line number Diff line number Diff line change
Expand Up @@ -778,8 +778,18 @@
document.off(phonon.event.end, onBackdrop);
}

function onSidebar(target) {
var isSidebar = false;
for (; target && target !== document; target = target.parentNode) {
if (target.classList.contains('side-panel')) {
isSidebar = true;
break;
}
}
return isSidebar;
}

document.on('tap', function(evt) {
document.on(phonon.event.tap, function(evt) {

var target = evt.target;
var sidebarId = target.getAttribute('data-side-panel-id');
Expand Down Expand Up @@ -810,7 +820,7 @@
}
}
});

var onBackdrop = function(evt) {

var target = evt.target;
Expand Down
Loading

0 comments on commit a7eae58

Please sign in to comment.