From 5854148e0933570ab145eb881fd7578c6a8a78f5 Mon Sep 17 00:00:00 2001 From: Vergil Penkov Date: Tue, 15 Mar 2016 19:40:44 +0200 Subject: [PATCH] Resolved some scoping issues --- app/js/jquery.okayNav.js | 230 +++++++++++++++++----------------- dist/js/jquery.okayNav-min.js | 4 +- 2 files changed, 117 insertions(+), 117 deletions(-) diff --git a/app/js/jquery.okayNav.js b/app/js/jquery.okayNav.js index 50815d0..f348460 100644 --- a/app/js/jquery.okayNav.js +++ b/app/js/jquery.okayNav.js @@ -1,5 +1,5 @@ /*! - * jquery.okayNav.js 2.0.3 (https://github.com/VPenkov/okayNav) + * jquery.okayNav.js 2.0.4 (https://github.com/VPenkov/okayNav) * Author: Vergil Penkov (http://vergilpenkov.com/) * MIT license: https://opensource.org/licenses/MIT */ @@ -25,6 +25,7 @@ } }(function($) { // Defaults + var okayNav = 'okayNav', defaults = { parent: '', // will call nav's parent() by default @@ -46,32 +47,31 @@ function Plugin(element, options) { self = this; this.options = $.extend({}, defaults, options); - _options = this.options; + self.options = this.options; - $navigation = $(element); - $document = $(document); - $window = $(window); + self.navigation = $(element); + self.document = $(document); + self.window = $(window); - this.options.parent == '' ? this.options.parent = $navigation.parent() : ''; + this.options.parent == '' ? this.options.parent = self.navigation.parent() : ''; - _nav_visible = false; // Store the state of the hidden nav - _nav_full_width = 0; - _parent_full_width = 0; + self.nav_open = false; // Store the state of the hidden nav + self.parent_full_width = 0; // Swipe stuff - radCoef = 180 / Math.PI; - _sTouch = { + self.radCoef = 180 / Math.PI; + self.sTouch = { x: 0, y: 0 }; - _cTouch = { + self.cTouch = { x: 0, y: 0 }; - _sTime = 0; - _nav_position = 0; - _percent_open = 0; - _nav_moving = false; + self.sTime = 0; + self.nav_position = 0; + self.percent_open = 0; + self.nav_moving = false; self.init(); @@ -84,52 +84,52 @@ $('body').addClass('okayNav-loaded'); // Add classes - $navigation + self.navigation .addClass('okayNav loaded') .children('ul').addClass('okayNav__nav--visible'); // Append elements if (self.options.align_right) { - $navigation + self.navigation .append('