Skip to content

Prevent slideout if touchY changes more than 40 pixels #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michaek wants to merge 1 commit into
base: new-features
Choose a base branch
from
Open

Prevent slideout if touchY changes more than 40 pixels #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions dist/slideout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,41 @@ var Slideout =
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};

/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {

/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId])
/******/ return installedModules[moduleId].exports;

/******/
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };

/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);

/******/
/******/ // Flag the module as loaded
/******/ module.l = true;

/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }


/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;

/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;

/******/
/******/ // identity function for calling harmony imports with the correct context
/******/ __webpack_require__.i = function(value) { return value; };

/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
Expand All @@ -47,7 +47,7 @@ var Slideout =
/******/ });
/******/ }
/******/ };

/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
Expand All @@ -56,13 +56,13 @@ var Slideout =
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };

/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };

/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "";

/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 2);
/******/ })
Expand All @@ -80,7 +80,7 @@ var requestAnimFrame = (function() {
function (callback) {
window.setTimeout(callback, 1000 / 60);
};
}());
}().bind(window));

function decouple(node, event, fn) {
var eve,
Expand Down Expand Up @@ -353,6 +353,7 @@ function Slideout(options) {

// Sets default values
this._startOffsetX = 0;
this._startOffsetY = 0;
this._currentOffsetX = 0;
this._opening = false;
this._moved = false;
Expand Down Expand Up @@ -538,6 +539,7 @@ Slideout.prototype._initTouchEvents = function() {
self._moved = false;
self._opening = false;
self._startOffsetX = eve.touches[0].pageX;
self._startOffsetY = eve.touches[0].pageY;

var offset = self._startOffsetX;
if (self._side === 'right') {
Expand All @@ -555,6 +557,7 @@ Slideout.prototype._initTouchEvents = function() {
this._onTouchCancelFn = function() {
self._moved = false;
self._opening = false;
self._preventOpen = false;
};

this.panel.addEventListener('touchcancel', this._onTouchCancelFn);
Expand All @@ -568,6 +571,7 @@ Slideout.prototype._initTouchEvents = function() {
self.emit('translateend');
(self._opening && Math.abs(self._currentOffsetX) > self._tolerance) ? self.open() : self.close();
}
self._preventOpen = false;
self._moved = false;
};

Expand All @@ -588,6 +592,7 @@ Slideout.prototype._initTouchEvents = function() {
}

var dif_x = eve.touches[0].clientX - self._startOffsetX;
var dif_y = eve.touches[0].clientY - self._startOffsetY;
var translateX = self._currentOffsetX = dif_x;


Expand Down Expand Up @@ -620,6 +625,9 @@ Slideout.prototype._initTouchEvents = function() {
self._translateXTo(translateX);
self.emit('translate', translateX);
self._moved = true;
} else if (Math.abs(dif_y) > 40 && !self._opening) {
self._preventOpen = true;
return;
}

};
Expand Down
2 changes: 1 addition & 1 deletion dist/slideout.min.js
View file
Open in desktop

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

Loading