wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add back polymer changes

Browse Source
This commit is contained in:
Luke Pulverenti
2015-07-09 23:19:14 -04:00
parent 319d838d6e
commit 5cc8cf839a
3 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.html
Vendored
+15 -3
View File
@@ -368,6 +368,7 @@ To change the drawer container when it's in the right side:
*/
openDrawer: function() {
this.selected = 'drawer';
this.fire('paper-drawer-panel-open');
},
/**
@@ -376,7 +377,8 @@ To change the drawer container when it's in the right side:
* @method closeDrawer
*/
closeDrawer: function() {
this.selected = 'main';
this.selected = 'main';
this.fire('paper-drawer-panel-close');
},
ready: function() {
@@ -554,6 +556,13 @@ To change the drawer container when it's in the right side:
this._setPeeking(false);
}
var dy = event.detail.dy;
var absDy = Math.abs(dy);
if (absDy >= 70) {
// Ignore trackx until we move past the edge peek.
return;
}
this._moveDrawer(this._translateXForDeltaX(dx));
}
},
@@ -567,10 +576,13 @@ To change the drawer container when it's in the right side:
sharedPanel = null;
this._moveDrawer(null);
var dx = event.detail.dx;
var dy = event.detail.dy;
var absDy = Math.abs(dy);
if (this.rightDrawer) {
this[xDirection ? 'closeDrawer' : 'openDrawer']();
this[xDirection ? 'closeDrawer' : 'openDrawer']();
} else {
this[xDirection ? 'openDrawer' : 'closeDrawer']();
this[xDirection || dx > -80 || absDy >= 70 ? 'openDrawer' : 'closeDrawer']();
}
}
},
dashboard-ui/bower_components/polymer/polymer.html
Vendored
+2 -1
View File
@@ -568,7 +568,8 @@ prevent = dy > dx;
prevent = dx > dy;
}
if (prevent) {
ev.preventDefault();
//This breaks scrolling in safari
//ev.preventDefault();
}
}
},
dashboard-ui/vulcanize-out.html
+17 -4
View File
@@ -2516,7 +2516,8 @@ prevent = dy > dx;
prevent = dx > dy;
}
if (prevent) {
ev.preventDefault();
//This breaks scrolling in safari
//ev.preventDefault();
}
}
},
@@ -14923,6 +14924,7 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
*/
openDrawer: function() {
this.selected = 'drawer';
this.fire('paper-drawer-panel-open');
},
/**
@@ -14931,7 +14933,8 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
* @method closeDrawer
*/
closeDrawer: function() {
this.selected = 'main';
this.selected = 'main';
this.fire('paper-drawer-panel-close');
},
ready: function() {
@@ -15109,6 +15112,13 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
this._setPeeking(false);
}
var dy = event.detail.dy;
var absDy = Math.abs(dy);
if (absDy >= 70) {
// Ignore trackx until we move past the edge peek.
return;
}
this._moveDrawer(this._translateXForDeltaX(dx));
}
},
@@ -15122,10 +15132,13 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
sharedPanel = null;
this._moveDrawer(null);
var dx = event.detail.dx;
var dy = event.detail.dy;
var absDy = Math.abs(dy);
if (this.rightDrawer) {
this[xDirection ? 'closeDrawer' : 'openDrawer']();
this[xDirection ? 'closeDrawer' : 'openDrawer']();
} else {
this[xDirection ? 'openDrawer' : 'closeDrawer']();
this[xDirection || dx > -80 || absDy >= 70 ? 'openDrawer' : 'closeDrawer']();
}
}
},