From d84bae2d33b4544cd44034d1c87fcdaec9fd4e10 Mon Sep 17 00:00:00 2001 From: Daan de Graaf Date: Mon, 16 Mar 2015 18:36:24 +0100 Subject: [PATCH 1/2] Implement 'fromedge' option and behaviour --- README.md | 7 +++++-- dist/slideout.js | 7 +++++-- dist/slideout.min.js | 2 +- index.js | 5 ++++- test/test.js | 3 ++- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 681928a..6c89876 100644 --- a/README.md +++ b/README.md @@ -165,7 +165,8 @@ Then you just include Slideout.js and create a new instace with some options: 'panel': document.getElementById('panel'), 'menu': document.getElementById('menu'), 'padding': 256, - 'tolerance': 70 + 'tolerance': 70, + 'fromedge': true }); @@ -193,13 +194,15 @@ Create a new instance of `Slideout`. - `[options.fx]` (String) - The CSS effect to use when animating the opening and closing of the slideout. Default: `ease`. - `[options.padding]` (Number) - Default: `256`. - `[options.tolerance]` (Number) - Default: `70`. +- `[options.fromedge]` (Boolean) - Slide the panel only if the touch started on the left 33% of the screen. Default: true. ```js var slideout = new Slideout({ 'panel': document.getElementById('main'), 'menu': document.getElementById('menu'), 'padding': 256, - 'tolerance': 70 + 'tolerance': 70, + 'fromedge': true }); ``` diff --git a/dist/slideout.js b/dist/slideout.js index cd07074..d75fccd 100644 --- a/dist/slideout.js +++ b/dist/slideout.js @@ -62,6 +62,7 @@ function Slideout(options) { this._duration = parseInt(options.duration, 10) || 300; this._tolerance = parseInt(options.tolerance, 10) || 70; this._padding = parseInt(options.padding, 10) || 256; + this._fromedge = options.fromedge || typeof options.fromedge == 'undefined'; // Init touch events this._initTouchEvents(); @@ -159,9 +160,11 @@ Slideout.prototype._initTouchEvents = function() { * Resets values on touchstart */ this.panel.addEventListener(touch.start, function(eve) { + var off_x = eve.touches[0].pageX; + if(self._fromedge && !self.isOpen() && off_x > screen.width/3){ self._preventOpen = true; return; } self._moved = false; self._opening = false; - self._startOffsetX = eve.touches[0].pageX; + self._startOffsetX = off_x; self._preventOpen = (!self.isOpen() && self.menu.clientWidth !== 0); }); @@ -265,4 +268,4 @@ module.exports = decouple; },{}]},{},[1])(1) }); -//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["node_modules/browserify/node_modules/browser-pack/_prelude.js","index.js","node_modules/decouple/index.js"],"names":[],"mappings":"AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC/NA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","'use strict';\n\n/**\n * Module dependencies\n */\nvar decouple = require('decouple');\n\n/**\n * Privates\n */\nvar scrollTimeout;\nvar scrolling = false;\nvar doc = window.document;\nvar html = doc.documentElement;\nvar msPointerSupported = window.navigator.msPointerEnabled;\nvar touch = {\n  'start': msPointerSupported ? 'MSPointerDown' : 'touchstart',\n  'move': msPointerSupported ? 'MSPointerMove' : 'touchmove',\n  'end': msPointerSupported ? 'MSPointerUp' : 'touchend'\n};\nvar prefix = (function prefix() {\n  var regex = /^(Webkit|Khtml|Moz|ms|O)(?=[A-Z])/;\n  var styleDeclaration = doc.getElementsByTagName('script')[0].style;\n  for (var prop in styleDeclaration) {\n    if (regex.test(prop)) {\n      return '-' + prop.match(regex)[0].toLowerCase() + '-';\n    }\n  }\n  // Nothing found so far? Webkit does not enumerate over the CSS properties of the style object.\n  // However (prop in style) returns the correct value, so we'll have to test for\n  // the precence of a specific property\n  if ('WebkitOpacity' in styleDeclaration) { return '-webkit-'; }\n  if ('KhtmlOpacity' in styleDeclaration) { return '-khtml-'; }\n  return '';\n}());\n\n/**\n * Slideout constructor\n */\nfunction Slideout(options) {\n  options = options || {};\n\n  // Sets default values\n  this._startOffsetX = 0;\n  this._currentOffsetX = 0;\n  this._opening = false;\n  this._moved = false;\n  this._opened = false;\n  this._preventOpen = false;\n\n  // Sets panel\n  this.panel = options.panel;\n  this.menu = options.menu;\n\n  // Sets  classnames\n  this.panel.className += ' slideout-panel';\n  this.menu.className += ' slideout-menu';\n\n  // Sets options\n  this._fx = options.fx || 'ease';\n  this._duration = parseInt(options.duration, 10) || 300;\n  this._tolerance = parseInt(options.tolerance, 10) || 70;\n  this._padding = parseInt(options.padding, 10) || 256;\n\n  // Init touch events\n  this._initTouchEvents();\n}\n\n/**\n * Opens the slideout menu.\n */\nSlideout.prototype.open = function() {\n  var self = this;\n  if (html.className.search('slideout-open') === -1) { html.className += ' slideout-open'; }\n  this._setTransition();\n  this._translateXTo(this._padding);\n  this._opened = true;\n  setTimeout(function() {\n    self.panel.style.transition = self.panel.style['-webkit-transition'] = '';\n  }, this._duration + 50);\n  return this;\n};\n\n/**\n * Closes slideout menu.\n */\nSlideout.prototype.close = function() {\n  var self = this;\n  if (!this.isOpen() && !this._opening) { return this; }\n  this._setTransition();\n  this._translateXTo(0);\n  this._opened = false;\n  setTimeout(function() {\n    html.className = html.className.replace(/ slideout-open/, '');\n    self.panel.style.transition = self.panel.style['-webkit-transition'] = '';\n  }, this._duration + 50);\n  return this;\n};\n\n/**\n * Toggles (open/close) slideout menu.\n */\nSlideout.prototype.toggle = function() {\n  return this.isOpen() ? this.close() : this.open();\n};\n\n/**\n * Returns true if the slideout is currently open, and false if it is closed.\n */\nSlideout.prototype.isOpen = function() {\n  return this._opened;\n};\n\n/**\n * Translates panel and updates currentOffset with a given X point\n */\nSlideout.prototype._translateXTo = function(translateX) {\n  this._currentOffsetX = translateX;\n  this.panel.style[prefix + 'transform'] = this.panel.style.transform = 'translate3d(' + translateX + 'px, 0, 0)';\n};\n\n/**\n * Set transition properties\n */\nSlideout.prototype._setTransition = function() {\n  this.panel.style[prefix + 'transition'] = this.panel.style.transition = prefix + 'transform ' + this._duration + 'ms ' + this._fx;\n};\n\n/**\n * Initializes touch event\n */\nSlideout.prototype._initTouchEvents = function() {\n  var self = this;\n\n  /**\n   * Decouple scroll event\n   */\n  decouple(doc, 'scroll', function() {\n    if (!self._moved) {\n      clearTimeout(scrollTimeout);\n      scrolling = true;\n      scrollTimeout = setTimeout(function() {\n        scrolling = false;\n      }, 250);\n    }\n  });\n\n  /**\n   * Prevents touchmove event if slideout is moving\n   */\n  doc.addEventListener(touch.move, function(eve) {\n    if (self._moved) {\n      eve.preventDefault();\n    }\n  });\n\n  /**\n   * Resets values on touchstart\n   */\n  this.panel.addEventListener(touch.start, function(eve) {\n    self._moved = false;\n    self._opening = false;\n    self._startOffsetX = eve.touches[0].pageX;\n    self._preventOpen = (!self.isOpen() && self.menu.clientWidth !== 0);\n  });\n\n  /**\n   * Resets values on touchcancel\n   */\n  this.panel.addEventListener('touchcancel', function() {\n    self._moved = false;\n    self._opening = false;\n  });\n\n  /**\n   * Toggles slideout on touchend\n   */\n  this.panel.addEventListener(touch.end, function() {\n    if (self._moved) {\n      (self._opening && Math.abs(self._currentOffsetX) > self._tolerance) ? self.open() : self.close();\n    }\n    self._moved = false;\n  });\n\n  /**\n   * Translates panel on touchmove\n   */\n  this.panel.addEventListener(touch.move, function(eve) {\n\n    if (scrolling || self._preventOpen) { return; }\n\n    var dif_x = eve.touches[0].clientX - self._startOffsetX;\n    var translateX = self._currentOffsetX = dif_x;\n\n    if (Math.abs(translateX) > self._padding) { return; }\n\n    if (Math.abs(dif_x) > 20) {\n      self._opening = true;\n\n      if (self._opened && dif_x > 0 || !self._opened && dif_x < 0) { return; }\n\n      if (!self._moved && html.className.search('slideout-open') === -1) {\n        html.className += ' slideout-open';\n      }\n\n      if (dif_x <= 0) {\n        translateX = dif_x + self._padding;\n        self._opening = false;\n      }\n\n      self.panel.style[prefix + 'transform'] = self.panel.style.transform = 'translate3d(' + translateX + 'px, 0, 0)';\n\n      self._moved = true;\n    }\n\n  });\n\n};\n\n/**\n * Expose Slideout\n */\nmodule.exports = Slideout;\n","'use strict';\n\nvar requestAnimFrame = (function() {\n  return window.requestAnimationFrame ||\n    window.webkitRequestAnimationFrame ||\n    function (callback) {\n      window.setTimeout(callback, 1000 / 60);\n    };\n}());\n\nfunction decouple(node, event, fn) {\n  var eve,\n      tracking = false;\n\n  function captureEvent(e) {\n    eve = e;\n    track();\n  }\n\n  function track() {\n    if (!tracking) {\n      requestAnimFrame(update);\n      tracking = true;\n    }\n  }\n\n  function update() {\n    fn.call(node, eve);\n    tracking = false;\n  }\n\n  node.addEventListener(event, captureEvent, false);\n}\n\n/**\n * Expose decouple\n */\nmodule.exports = decouple;\n"]} +//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["node_modules/browserify/node_modules/browser-pack/_prelude.js","index.js","node_modules/decouple/index.js"],"names":[],"mappings":"AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","'use strict';\n\n/**\n * Module dependencies\n */\nvar decouple = require('decouple');\n\n/**\n * Privates\n */\nvar scrollTimeout;\nvar scrolling = false;\nvar doc = window.document;\nvar html = doc.documentElement;\nvar msPointerSupported = window.navigator.msPointerEnabled;\nvar touch = {\n  'start': msPointerSupported ? 'MSPointerDown' : 'touchstart',\n  'move': msPointerSupported ? 'MSPointerMove' : 'touchmove',\n  'end': msPointerSupported ? 'MSPointerUp' : 'touchend'\n};\nvar prefix = (function prefix() {\n  var regex = /^(Webkit|Khtml|Moz|ms|O)(?=[A-Z])/;\n  var styleDeclaration = doc.getElementsByTagName('script')[0].style;\n  for (var prop in styleDeclaration) {\n    if (regex.test(prop)) {\n      return '-' + prop.match(regex)[0].toLowerCase() + '-';\n    }\n  }\n  // Nothing found so far? Webkit does not enumerate over the CSS properties of the style object.\n  // However (prop in style) returns the correct value, so we'll have to test for\n  // the precence of a specific property\n  if ('WebkitOpacity' in styleDeclaration) { return '-webkit-'; }\n  if ('KhtmlOpacity' in styleDeclaration) { return '-khtml-'; }\n  return '';\n}());\n\n/**\n * Slideout constructor\n */\nfunction Slideout(options) {\n  options = options || {};\n\n  // Sets default values\n  this._startOffsetX = 0;\n  this._currentOffsetX = 0;\n  this._opening = false;\n  this._moved = false;\n  this._opened = false;\n  this._preventOpen = false;\n\n  // Sets panel\n  this.panel = options.panel;\n  this.menu = options.menu;\n\n  // Sets  classnames\n  this.panel.className += ' slideout-panel';\n  this.menu.className += ' slideout-menu';\n\n  // Sets options\n  this._fx = options.fx || 'ease';\n  this._duration = parseInt(options.duration, 10) || 300;\n  this._tolerance = parseInt(options.tolerance, 10) || 70;\n  this._padding = parseInt(options.padding, 10) || 256;\n  this._fromedge = options.fromedge || typeof options.fromedge == 'undefined';\n\n  // Init touch events\n  this._initTouchEvents();\n}\n\n/**\n * Opens the slideout menu.\n */\nSlideout.prototype.open = function() {\n  var self = this;\n  if (html.className.search('slideout-open') === -1) { html.className += ' slideout-open'; }\n  this._setTransition();\n  this._translateXTo(this._padding);\n  this._opened = true;\n  setTimeout(function() {\n    self.panel.style.transition = self.panel.style['-webkit-transition'] = '';\n  }, this._duration + 50);\n  return this;\n};\n\n/**\n * Closes slideout menu.\n */\nSlideout.prototype.close = function() {\n  var self = this;\n  if (!this.isOpen() && !this._opening) { return this; }\n  this._setTransition();\n  this._translateXTo(0);\n  this._opened = false;\n  setTimeout(function() {\n    html.className = html.className.replace(/ slideout-open/, '');\n    self.panel.style.transition = self.panel.style['-webkit-transition'] = '';\n  }, this._duration + 50);\n  return this;\n};\n\n/**\n * Toggles (open/close) slideout menu.\n */\nSlideout.prototype.toggle = function() {\n  return this.isOpen() ? this.close() : this.open();\n};\n\n/**\n * Returns true if the slideout is currently open, and false if it is closed.\n */\nSlideout.prototype.isOpen = function() {\n  return this._opened;\n};\n\n/**\n * Translates panel and updates currentOffset with a given X point\n */\nSlideout.prototype._translateXTo = function(translateX) {\n  this._currentOffsetX = translateX;\n  this.panel.style[prefix + 'transform'] = this.panel.style.transform = 'translate3d(' + translateX + 'px, 0, 0)';\n};\n\n/**\n * Set transition properties\n */\nSlideout.prototype._setTransition = function() {\n  this.panel.style[prefix + 'transition'] = this.panel.style.transition = prefix + 'transform ' + this._duration + 'ms ' + this._fx;\n};\n\n/**\n * Initializes touch event\n */\nSlideout.prototype._initTouchEvents = function() {\n  var self = this;\n\n  /**\n   * Decouple scroll event\n   */\n  decouple(doc, 'scroll', function() {\n    if (!self._moved) {\n      clearTimeout(scrollTimeout);\n      scrolling = true;\n      scrollTimeout = setTimeout(function() {\n        scrolling = false;\n      }, 250);\n    }\n  });\n\n  /**\n   * Prevents touchmove event if slideout is moving\n   */\n  doc.addEventListener(touch.move, function(eve) {\n    if (self._moved) {\n      eve.preventDefault();\n    }\n  });\n\n  /**\n   * Resets values on touchstart\n   */\n  this.panel.addEventListener(touch.start, function(eve) {\n    var off_x = eve.touches[0].pageX;\n    if(self._fromedge && !self.isOpen() && off_x > screen.width/3){ self._preventOpen = true; return; }\n    self._moved = false;\n    self._opening = false;\n    self._startOffsetX = off_x;\n    self._preventOpen = (!self.isOpen() && self.menu.clientWidth !== 0);\n  });\n\n  /**\n   * Resets values on touchcancel\n   */\n  this.panel.addEventListener('touchcancel', function() {\n    self._moved = false;\n    self._opening = false;\n  });\n\n  /**\n   * Toggles slideout on touchend\n   */\n  this.panel.addEventListener(touch.end, function() {\n    if (self._moved) {\n      (self._opening && Math.abs(self._currentOffsetX) > self._tolerance) ? self.open() : self.close();\n    }\n    self._moved = false;\n  });\n\n  /**\n   * Translates panel on touchmove\n   */\n  this.panel.addEventListener(touch.move, function(eve) {\n\n    if (scrolling || self._preventOpen) { return; }\n\n    var dif_x = eve.touches[0].clientX - self._startOffsetX;\n    var translateX = self._currentOffsetX = dif_x;\n\n    if (Math.abs(translateX) > self._padding) { return; }\n\n    if (Math.abs(dif_x) > 20) {\n      self._opening = true;\n\n      if (self._opened && dif_x > 0 || !self._opened && dif_x < 0) { return; }\n\n      if (!self._moved && html.className.search('slideout-open') === -1) {\n        html.className += ' slideout-open';\n      }\n\n      if (dif_x <= 0) {\n        translateX = dif_x + self._padding;\n        self._opening = false;\n      }\n\n      self.panel.style[prefix + 'transform'] = self.panel.style.transform = 'translate3d(' + translateX + 'px, 0, 0)';\n\n      self._moved = true;\n    }\n\n  });\n\n};\n\n/**\n * Expose Slideout\n */\nmodule.exports = Slideout;\n","'use strict';\n\nvar requestAnimFrame = (function() {\n  return window.requestAnimationFrame ||\n    window.webkitRequestAnimationFrame ||\n    function (callback) {\n      window.setTimeout(callback, 1000 / 60);\n    };\n}());\n\nfunction decouple(node, event, fn) {\n  var eve,\n      tracking = false;\n\n  function captureEvent(e) {\n    eve = e;\n    track();\n  }\n\n  function track() {\n    if (!tracking) {\n      requestAnimFrame(update);\n      tracking = true;\n    }\n  }\n\n  function update() {\n    fn.call(node, eve);\n    tracking = false;\n  }\n\n  node.addEventListener(event, captureEvent, false);\n}\n\n/**\n * Expose decouple\n */\nmodule.exports = decouple;\n"]} diff --git a/dist/slideout.min.js b/dist/slideout.min.js index 2d668c3..d781223 100644 --- a/dist/slideout.min.js +++ b/dist/slideout.min.js @@ -1 +1 @@ -!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;"undefined"!=typeof window?t=window:"undefined"!=typeof global?t=global:"undefined"!=typeof self&&(t=self),t.Slideout=e()}}(function(){var e,t,n;return function i(e,t,n){function s(r,a){if(!t[r]){if(!e[r]){var f=typeof require=="function"&&require;if(!a&&f)return f(r,!0);if(o)return o(r,!0);var u=new Error("Cannot find module '"+r+"'");throw u.code="MODULE_NOT_FOUND",u}var l=t[r]={exports:{}};e[r][0].call(l.exports,function(t){var n=e[r][1][t];return s(n?n:t)},l,l.exports,i,e,t,n)}return t[r].exports}var o=typeof require=="function"&&require;for(var r=0;re._tolerance?e.open():e.close()}e._moved=false});this.panel.addEventListener(u.move,function(t){if(o||e._preventOpen){return}var n=t.touches[0].clientX-e._startOffsetX;var i=e._currentOffsetX=n;if(Math.abs(i)>e._padding){return}if(Math.abs(n)>20){e._opening=true;if(e._opened&&n>0||!e._opened&&n<0){return}if(!e._moved&&a.className.search("slideout-open")===-1){a.className+=" slideout-open"}if(n<=0){i=n+e._padding;e._opening=false}e.panel.style[l+"transform"]=e.panel.style.transform="translate3d("+i+"px, 0, 0)";e._moved=true}})};t.exports=p},{decouple:2}],2:[function(e,t,n){"use strict";var i=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||function(e){window.setTimeout(e,1e3/60)}}();function s(e,t,n){var s,o=false;function r(e){s=e;a()}function a(){if(!o){i(f);o=true}}function f(){n.call(e,s);o=false}e.addEventListener(t,r,false)}t.exports=s},{}]},{},[1])(1)}); \ No newline at end of file +!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;"undefined"!=typeof window?t=window:"undefined"!=typeof global?t=global:"undefined"!=typeof self&&(t=self),t.Slideout=e()}}(function(){var e,t,n;return function i(e,t,n){function s(r,a){if(!t[r]){if(!e[r]){var f=typeof require=="function"&&require;if(!a&&f)return f(r,!0);if(o)return o(r,!0);var u=new Error("Cannot find module '"+r+"'");throw u.code="MODULE_NOT_FOUND",u}var l=t[r]={exports:{}};e[r][0].call(l.exports,function(t){var n=e[r][1][t];return s(n?n:t)},l,l.exports,i,e,t,n)}return t[r].exports}var o=typeof require=="function"&&require;for(var r=0;rscreen.width/3){e._preventOpen=true;return}e._moved=false;e._opening=false;e._startOffsetX=n;e._preventOpen=!e.isOpen()&&e.menu.clientWidth!==0});this.panel.addEventListener("touchcancel",function(){e._moved=false;e._opening=false});this.panel.addEventListener(u.end,function(){if(e._moved){e._opening&&Math.abs(e._currentOffsetX)>e._tolerance?e.open():e.close()}e._moved=false});this.panel.addEventListener(u.move,function(t){if(o||e._preventOpen){return}var n=t.touches[0].clientX-e._startOffsetX;var i=e._currentOffsetX=n;if(Math.abs(i)>e._padding){return}if(Math.abs(n)>20){e._opening=true;if(e._opened&&n>0||!e._opened&&n<0){return}if(!e._moved&&a.className.search("slideout-open")===-1){a.className+=" slideout-open"}if(n<=0){i=n+e._padding;e._opening=false}e.panel.style[l+"transform"]=e.panel.style.transform="translate3d("+i+"px, 0, 0)";e._moved=true}})};t.exports=p},{decouple:2}],2:[function(e,t,n){"use strict";var i=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||function(e){window.setTimeout(e,1e3/60)}}();function s(e,t,n){var s,o=false;function r(e){s=e;a()}function a(){if(!o){i(f);o=true}}function f(){n.call(e,s);o=false}e.addEventListener(t,r,false)}t.exports=s},{}]},{},[1])(1)}); \ No newline at end of file diff --git a/index.js b/index.js index e8eba40..bed0a19 100644 --- a/index.js +++ b/index.js @@ -61,6 +61,7 @@ function Slideout(options) { this._duration = parseInt(options.duration, 10) || 300; this._tolerance = parseInt(options.tolerance, 10) || 70; this._padding = parseInt(options.padding, 10) || 256; + this._fromedge = options.fromedge || typeof options.fromedge == 'undefined'; // Init touch events this._initTouchEvents(); @@ -158,9 +159,11 @@ Slideout.prototype._initTouchEvents = function() { * Resets values on touchstart */ this.panel.addEventListener(touch.start, function(eve) { + var off_x = eve.touches[0].pageX; + if(self._fromedge && !self.isOpen() && off_x > screen.width/3){ self._preventOpen = true; return; } self._moved = false; self._opening = false; - self._startOffsetX = eve.touches[0].pageX; + self._startOffsetX = off_x; self._preventOpen = (!self.isOpen() && self.menu.clientWidth !== 0); }); diff --git a/test/test.js b/test/test.js index e48c632..02a0aa9 100644 --- a/test/test.js +++ b/test/test.js @@ -53,7 +53,8 @@ describe('Slideout', function () { '_fx', '_duration', '_tolerance', - '_padding' + '_padding', + '_fromedge' ]; var i = 0; var len = properties.length; From 085899719b3c1396b05ae95e2a1257f3b666ab43 Mon Sep 17 00:00:00 2001 From: Daan de Graaf Date: Mon, 16 Mar 2015 19:08:49 +0100 Subject: [PATCH 2/2] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6c89876..7fc7298 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,8 @@ Then you just include Slideout.js and create a new instace with some options: 'panel': document.getElementById('panel'), 'menu': document.getElementById('menu'), 'padding': 256, - 'tolerance': 70 + 'tolerance': 70, + 'fromedge': true }); ``` @@ -194,7 +195,7 @@ Create a new instance of `Slideout`. - `[options.fx]` (String) - The CSS effect to use when animating the opening and closing of the slideout. Default: `ease`. - `[options.padding]` (Number) - Default: `256`. - `[options.tolerance]` (Number) - Default: `70`. -- `[options.fromedge]` (Boolean) - Slide the panel only if the touch started on the left 33% of the screen. Default: true. +- `[options.fromedge]` (Boolean) - Slide the panel only if the touch started on the left 33% of the screen. Default: `true`. ```js var slideout = new Slideout({