Skip to content
Browse files

Removed unnecessary config variable.

  • Loading branch information...
1 parent 71ae353 commit 76683773ced6b00c5791fc5e690b13e3c22d11de @wnielson committed Feb 6, 2013
Showing with 2 additions and 2 deletions.
  1. +0 −1 app/view/Main.js
  2. +2 −1 ux/slidenavigation/View.js
View
1 app/view/Main.js
@@ -226,7 +226,6 @@ Ext.define("SlideNavigationExample.view.Main", {
scrollable: 'vertical',
style: 'margin: auto !important; text-align: center;',
maskOnOpen: true,
- controlScroll: true,
defaults: {
style: "float: left; margin: 10px; box-shadow: "+
"#999 0px 0px 6px 2px; border: 1px solid #888; "+
View
3 ux/slidenavigation/View.js
@@ -785,7 +785,8 @@ Ext.define('Ext.ux.slidenavigation.View', {
return false;
};
- //
+ // If vertical scroll-lock hasn't been enforced (``dragAllowedForced``), and
+ // ``deltaX`` is large enough, enable horizontal dragging
if (deltaX > containerSlideDelay && !container.dragAllowed && !container.dragAllowedForced) {
if (!container.dragAllowed) {
scrollParent = me.container.getActiveItem().down('component[scrollable]');

0 comments on commit 7668377

Please sign in to comment.
Something went wrong with that request. Please try again.