rbbt-rest 1.6.13 → 1.6.14

data/share/views/public/plugins/semantic-ui/src/definitions/modules/sidebar.less

@@ -1,15 +1,16 @@
-/*
- * # Semantic - Sidebar
+/*!
+ * # Semantic UI - Sidebar
  * http://github.com/semantic-org/semantic-ui/
  *
  *
- * Copyright 2014 Contributors
+ * Copyright 2015 Contributors
  * Released under the MIT license
  * http://opensource.org/licenses/MIT
  *
  */
 
 
+
 /*******************************
             Theme
 *******************************/
@@ -17,8 +18,7 @@
 @type    : 'module';
 @element : 'sidebar';
 
-@import '../../theme.config';
-
+@import (multiple) '../../theme.config';
 
 /*******************************
             Sidebar
@@ -38,14 +38,15 @@
   -webkit-overflow-scrolling: touch;
 
   height: 100% !important;
+  max-height: 100%;
   border-radius: 0em !important;
   margin: 0em !important;
   overflow-y: auto !important;
   z-index: @topLayer;
 }
 
-/* 3D Rendering */
-.ui.sidebar * {
+/* GPU Layers for Child Elements */
+.ui.sidebar > * {
   backface-visibility: hidden;
   transform: rotateZ(0deg);
 }
@@ -60,7 +61,6 @@
   left: 0px;
   transform: translate3d(-100%, 0, 0);
 }
-
 .ui.right.sidebar {
   right: 0px !important;
   left: auto !important;
@@ -71,15 +71,12 @@
 .ui.bottom.sidebar {
   width: 100% !important;
   height: auto !important;
-  overflow-y: visible !important;
 }
-
 .ui.top.sidebar {
   top: 0px !important;
   bottom: auto !important;
   transform: translate3d(0, -100%, 0);
 }
-
 .ui.bottom.sidebar {
   top: auto !important;
   bottom: 0px !important;
@@ -88,15 +85,31 @@
 
 
 /*--------------
-     Body
+     Pushable
 ---------------*/
 
 .pushable {
   height: 100%;
   overflow-x: hidden;
+  padding: 0em !important;
+}
+
+/* Whole Page */
+body.pushable {
   background: @canvasBackground !important;
 }
 
+/* Page Context */
+.pushable:not(body) {
+  transform: translate3d(0, 0, 0);
+}
+.pushable:not(body) > .ui.sidebar,
+.pushable:not(body) > .fixed,
+.pushable:not(body) > .pusher:after {
+  position: absolute;
+}
+
+
 /*--------------
      Fixed
 ---------------*/
@@ -117,13 +130,20 @@
 .pushable > .pusher {
   position: relative;
   backface-visibility: hidden;
+  overflow: hidden;
   min-height: 100%;
-
   transition: transform @duration @easing;
-  background: @pageBackground;
   z-index: @middleLayer;
 }
 
+body.pushable > .pusher {
+  background: @pageBackground;
+}
+
+/* Pusher should inherit background from context */
+.pushable > .pusher {
+  background: inherit;
+}
 
 /*--------------
      Dimmer
@@ -135,14 +155,9 @@
   right: 0px;
   content: '';
   background-color: @dimmerColor;
-  width: 0px;
-  height: 0px;
   overflow: hidden;
   opacity: 0;
-  transition:
-    transform @duration,
-    opacity @duration
-  ;
+  transition: @dimmerTransition;
   will-change: opacity;
   z-index: @dimmerLayer;
 }
@@ -170,7 +185,7 @@
 }
 
 /*--------------
-     Animating
+    Animating
 ---------------*/
 
 .ui.animating.sidebar {
@@ -183,27 +198,61 @@
 
 .ui.visible.sidebar {
   visibility: visible;
+  transform: translate3d(0, 0, 0);
 }
 
+/* Shadow Direction */
 .ui.left.visible.sidebar,
 .ui.right.visible.sidebar {
   box-shadow: @horizontalBoxShadow;
 }
-
 .ui.top.visible.sidebar,
 .ui.bottom.visible.sidebar {
   box-shadow: @verticalBoxShadow;
 }
 
+/* Visible On Load */
+.ui.visible.left.sidebar ~ .fixed,
+.ui.visible.left.sidebar ~ .pusher {
+  transform: translate3d(@width, 0, 0);
+}
+.ui.visible.right.sidebar ~ .fixed,
+.ui.visible.right.sidebar ~ .pusher {
+  transform: translate3d(-@width, 0, 0);
+}
+.ui.visible.top.sidebar ~ .fixed,
+.ui.visible.top.sidebar ~ .pusher {
+  transform: translate3d(0, @height, 0);
+}
+.ui.visible.bottom.sidebar ~ .fixed,
+.ui.visible.bottom.sidebar ~ .pusher {
+  transform: translate3d(0, -@height, 0);
+}
+
+/* opposite sides visible forces content overlay */
+.ui.visible.left.sidebar ~ .ui.visible.right.sidebar ~ .fixed,
+.ui.visible.left.sidebar ~ .ui.visible.right.sidebar ~ .pusher,
+.ui.visible.right.sidebar ~ .ui.visible.left.sidebar ~ .fixed,
+.ui.visible.right.sidebar ~ .ui.visible.left.sidebar ~ .pusher {
+  transform: translate3d(0, 0, 0);
+}
+
 /*--------------
-     Mobile
+       iOS
 ---------------*/
 
-@media only screen and (max-width: @computerBreakpoint) {
-  html {
-    overflow-x: hidden;
-    -webkit-overflow-scrolling: touch;
-  }
+/*
+  iOS incorrectly sizes document when content
+  is presented outside of view with 2Dtranslate
+*/
+html.ios {
+  overflow-x: hidden;
+  -webkit-overflow-scrolling: touch;
+}
+
+html.ios,
+html.ios body {
+  height: initial !important;
 }
 
 
@@ -218,25 +267,63 @@
 /* Left / Right */
 .ui[class*="very thin"].left.sidebar,
 .ui[class*="very thin"].right.sidebar {
-  width: @sidebarVeryThinWidth;
+  width: @veryThinWidth;
 }
 .ui.thin.left.sidebar,
 .ui.thin.right.sidebar {
-  width: @sidebarThinWidth;
+  width: @thinWidth;
 }
 .ui.left.sidebar,
 .ui.right.sidebar {
-  width: @sidebarWidth;
+  width: @width;
 }
 .ui.wide.left.sidebar,
 .ui.wide.right.sidebar {
-  width: @sidebarWideWidth;
+  width: @wideWidth;
 }
 .ui[class*="very wide"].left.sidebar,
 .ui[class*="very wide"].right.sidebar {
-  width: @sidebarVeryWideWidth;
+  width: @veryWideWidth;
 }
 
+/* Left Visible */
+.ui.visible[class*="very thin"].left.sidebar ~ .fixed,
+.ui.visible[class*="very thin"].left.sidebar ~ .pusher {
+  transform: translate3d(@veryThinWidth, 0, 0);
+}
+.ui.visible.thin.left.sidebar ~ .fixed,
+.ui.visible.thin.left.sidebar ~ .pusher {
+  transform: translate3d(@thinWidth, 0, 0);
+}
+.ui.visible.wide.left.sidebar ~ .fixed,
+.ui.visible.wide.left.sidebar ~ .pusher {
+  transform: translate3d(@wideWidth, 0, 0);
+}
+.ui.visible[class*="very wide"].left.sidebar ~ .fixed,
+.ui.visible[class*="very wide"].left.sidebar ~ .pusher {
+  transform: translate3d(@veryWideWidth, 0, 0);
+}
+
+/* Right Visible */
+.ui.visible[class*="very thin"].right.sidebar ~ .fixed,
+.ui.visible[class*="very thin"].right.sidebar ~ .pusher {
+  transform: translate3d(-@veryThinWidth, 0, 0);
+}
+.ui.visible.thin.right.sidebar ~ .fixed,
+.ui.visible.thin.right.sidebar ~ .pusher {
+  transform: translate3d(-@thinWidth, 0, 0);
+}
+.ui.visible.wide.right.sidebar ~ .fixed,
+.ui.visible.wide.right.sidebar ~ .pusher {
+  transform: translate3d(-@wideWidth, 0, 0);
+}
+.ui.visible[class*="very wide"].right.sidebar ~ .fixed,
+.ui.visible[class*="very wide"].right.sidebar ~ .pusher {
+  transform: translate3d(-@veryWideWidth, 0, 0);
+}
+
+
+
 /*******************************
           Animations
 *******************************/
@@ -250,15 +337,7 @@
   z-index: @topLayer;
 }
 
-/* Animation */
-.animating.ui.overlay.sidebar,
-.ui.visible.overlay.sidebar {
-  transition: transform @duration @easing;
-}
-
-/*--- Left ---*/
-
-/* Set-up */
+/* Initial */
 .ui.left.overlay.sidebar {
   transform: translate3d(-100%, 0%, 0);
 }
@@ -272,7 +351,13 @@
   transform: translate3d(0%, 100%, 0);
 }
 
-/* End */
+/* Animation */
+.animating.ui.overlay.sidebar,
+.ui.visible.overlay.sidebar {
+  transition: transform @duration @easing;
+}
+
+/* End - Sidebar */
 .ui.visible.left.overlay.sidebar {
   transform: translate3d(0%, 0%, 0);
 }
@@ -286,6 +371,7 @@
   transform: translate3d(0%, 0%, 0);
 }
 
+/* End - Pusher */
 .ui.visible.overlay.sidebar ~ .fixed,
 .ui.visible.overlay.sidebar ~ .pusher {
   transform: none !important;
@@ -303,6 +389,7 @@
   z-index: @topLayer;
 }
 
+/* Sidebar - Initial */
 .ui.left.push.sidebar {
   transform: translate3d(-100%, 0, 0);
 }
@@ -347,6 +434,8 @@
 .ui.slide.along.sidebar {
   z-index: @bottomLayer;
 }
+
+/* Sidebar - Initial */
 .ui.left.slide.along.sidebar {
   transform: translate3d(-50%, 0, 0);
 }
@@ -360,6 +449,7 @@
   transform: translate3d(0%, 50%, 0);
 }
 
+/* Animation */
 .ui.animating.slide.along.sidebar {
   transition: transform @duration @easing;
 }
@@ -378,6 +468,8 @@
 .ui.slide.out.sidebar {
   z-index: @bottomLayer;
 }
+
+/* Sidebar - Initial */
 .ui.left.slide.out.sidebar {
   transform: translate3d(50%, 0, 0);
 }
@@ -411,6 +503,7 @@
   z-index: @topLayer;
 }
 
+/* Sidebar - Initial  */
 .ui.left.scale.down.sidebar {
   transform: translate3d(-100%, 0, 0);
 }
@@ -424,6 +517,7 @@
   transform: translate3d(0%, 100%, 0);
 }
 
+/* Pusher - Initial */
 .ui.scale.down.left.sidebar ~ .pusher {
   transform-origin: 75% 50%;
 }
@@ -446,7 +540,7 @@
   display: block !important;
   width: 100%;
   height: 100%;
-  overflow: hidden;
+  overflow: hidden !important;
 }
 
 /* End */
@@ -456,3 +550,5 @@
 .ui.visible.scale.down.sidebar ~ .pusher {
   transform: scale(0.75);
 }
+
+.loadUIOverrides();

data/share/views/public/plugins/semantic-ui/src/definitions/modules/sticky.js

@@ -1,9 +1,9 @@
- /*
- * # Semantic - Sticky
+/*!
+ * # Semantic UI - Sticky
  * http://github.com/semantic-org/semantic-ui/
  *
  *
- * Copyright 2014 Contributors
+ * Copyright 2015 Contributors
  * Released under the MIT license
  * http://opensource.org/licenses/MIT
  *
@@ -30,7 +30,9 @@ $.fn.sticky = function(parameters) {
   $allModules
     .each(function() {
       var
-        settings              = $.extend(true, {}, $.fn.sticky.settings, parameters),
+        settings              = ( $.isPlainObject(parameters) )
+          ? $.extend(true, {}, $.fn.sticky.settings, parameters)
+          : $.extend({}, $.fn.sticky.settings),
 
         className             = settings.className,
         namespace             = settings.namespace,
@@ -41,8 +43,8 @@ $.fn.sticky = function(parameters) {
 
         $module               = $(this),
         $window               = $(window),
-        $container            = $module.offsetParent(),
         $scroll               = $(settings.scrollContext),
+        $container,
         $context,
 
         selector              = $module.selector || '',
@@ -62,37 +64,18 @@ $.fn.sticky = function(parameters) {
       module      = {
 
         initialize: function() {
-          if(settings.context) {
-            $context = $(settings.context);
-          }
-          else {
-            $context = $container;
-          }
-          if($context.size() === 0) {
-            module.error(error.invalidContext, settings.context, $module);
-            return;
-          }
+
+          module.determineContainer();
+          module.determineContext();
           module.verbose('Initializing sticky', settings, $container);
+
           module.save.positions();
+          module.checkErrors();
+          module.bind.events();
 
-          // error conditions
-          if( module.is.hidden() ) {
-            module.error(error.visible, $module);
+          if(settings.observeChanges) {
+            module.observeChanges();
           }
-          if(module.cache.element.height > module.cache.context.height) {
-            module.reset();
-            module.error(error.elementSize, $module);
-            return;
-          }
-
-          $window
-            .on('resize' + eventNamespace, module.event.resize)
-          ;
-          $scroll
-            .on('scroll' + eventNamespace, module.event.scroll)
-          ;
-
-          module.observeChanges();
           module.instantiate();
         },
 
@@ -105,17 +88,19 @@ $.fn.sticky = function(parameters) {
         },
 
         destroy: function() {
-          module.verbose('Destroying previous module');
+          module.verbose('Destroying previous instance');
           module.reset();
+          if(observer) {
+            observer.disconnect();
+          }
           $window
+            .off('load' + eventNamespace, module.event.load)
             .off('resize' + eventNamespace, module.event.resize)
           ;
           $scroll
-            .off('scroll' + eventNamespace, module.event.scroll)
-          ;
-          $module
-            .removeData(moduleNamespace)
+            .off('scrollchange' + eventNamespace, module.event.scrollchange)
           ;
+          $module.removeData(moduleNamespace);
         },
 
         observeChanges: function() {
@@ -126,9 +111,9 @@ $.fn.sticky = function(parameters) {
             observer = new MutationObserver(function(mutations) {
               clearTimeout(module.timer);
               module.timer = setTimeout(function() {
-                module.verbose('DOM tree modified, updating sticky menu');
+                module.verbose('DOM tree modified, updating sticky menu', mutations);
                 module.refresh();
-              }, 200);
+              }, 100);
             });
             observer.observe(element, {
               childList : true,
@@ -142,48 +127,100 @@ $.fn.sticky = function(parameters) {
           }
         },
 
+        determineContainer: function() {
+          $container = $module.offsetParent();
+        },
+
+        determineContext: function() {
+          if(settings.context) {
+            $context = $(settings.context);
+          }
+          else {
+            $context = $container;
+          }
+          if($context.length === 0) {
+            module.error(error.invalidContext, settings.context, $module);
+            return;
+          }
+        },
+
+        checkErrors: function() {
+          if( module.is.hidden() ) {
+            module.error(error.visible, $module);
+          }
+          if(module.cache.element.height > module.cache.context.height) {
+            module.reset();
+            module.error(error.elementSize, $module);
+            return;
+          }
+        },
+
+        bind: {
+          events: function() {
+            $window
+              .on('load' + eventNamespace, module.event.load)
+              .on('resize' + eventNamespace, module.event.resize)
+            ;
+            // pub/sub pattern
+            $scroll
+              .off('scroll' + eventNamespace)
+              .on('scroll' + eventNamespace, module.event.scroll)
+              .on('scrollchange' + eventNamespace, module.event.scrollchange)
+            ;
+          }
+        },
+
         event: {
+          load: function() {
+            module.verbose('Page contents finished loading');
+            requestAnimationFrame(module.refresh);
+          },
           resize: function() {
-            requestAnimationFrame(function() {
-              module.refresh();
-              module.stick();
-            });
+            module.verbose('Window resized');
+            requestAnimationFrame(module.refresh);
           },
           scroll: function() {
             requestAnimationFrame(function() {
-              module.stick();
-              $.proxy(settings.onScroll, element)();
+              $scroll.triggerHandler('scrollchange' + eventNamespace, $scroll.scrollTop() );
             });
+          },
+          scrollchange: function(event, scrollPosition) {
+            module.stick(scrollPosition);
+            settings.onScroll.call(element);
           }
         },
 
         refresh: function(hardRefresh) {
           module.reset();
+          if(!settings.context) {
+            module.determineContext();
+          }
           if(hardRefresh) {
-            $container = $module.offsetParent();
+            module.determineContainer();
           }
           module.save.positions();
           module.stick();
-          $.proxy(settings.onReposition, element)();
+          settings.onReposition.call(element);
         },
 
         supports: {
           sticky: function() {
             var
               $element = $('<div/>'),
-              element = $element.get()
-            ;
-            $element
-              .addClass(className.supported)
+              element = $element[0]
             ;
+            $element.addClass(className.supported);
             return($element.css('position').match('sticky'));
           }
         },
 
         save: {
-          scroll: function(scroll) {
+          lastScroll: function(scroll) {
             module.lastScroll = scroll;
           },
+          elementScroll: function(scroll) {
+            module.elementScroll = scroll;
+          },
           positions: function() {
             var
               window = {
@@ -199,8 +236,12 @@ $.fn.sticky = function(parameters) {
                 height : $module.outerHeight()
               },
               context = {
-                offset: $context.offset(),
-                height: $context.outerHeight()
+                offset        : $context.offset(),
+                height        : $context.outerHeight(),
+                bottomPadding : parseInt($context.css('padding-bottom'), 10)
+              },
+              container = {
+                height: $container.outerHeight()
               }
             ;
             module.cache = {
@@ -217,9 +258,10 @@ $.fn.sticky = function(parameters) {
                 bottom : element.offset.top + element.height
               },
               context: {
-                top    : context.offset.top,
-                height : context.height,
-                bottom : context.offset.top + context.height
+                top           : context.offset.top,
+                height        : context.height,
+                bottomPadding : context.bottomPadding,
+                bottom        : context.offset.top + context.height - context.bottomPadding
               }
             };
             module.set.containerSize();
@@ -253,11 +295,15 @@ $.fn.sticky = function(parameters) {
             ;
           },
           currentElementScroll: function() {
+            if(module.elementScroll) {
+              return module.elementScroll;
+            }
             return ( module.is.top() )
               ? Math.abs(parseInt($module.css('top'), 10))    || 0
               : Math.abs(parseInt($module.css('bottom'), 10)) || 0
             ;
           },
+
           elementScroll: function(scroll) {
             scroll = scroll || $scroll.scrollTop();
             var
@@ -265,14 +311,13 @@ $.fn.sticky = function(parameters) {
               window         = module.cache.window,
               delta          = module.get.scrollChange(scroll),
               maxScroll      = (element.height - window.height + settings.offset),
-              currentScroll  = module.get.currentElementScroll(),
-              possibleScroll = (currentScroll + delta),
-              elementScroll
+              elementScroll  = module.get.currentElementScroll(),
+              possibleScroll = (elementScroll + delta)
             ;
             if(module.cache.fits || possibleScroll < 0) {
               elementScroll = 0;
             }
-            else if (possibleScroll > maxScroll ) {
+            else if(possibleScroll > maxScroll ) {
               elementScroll = maxScroll;
             }
             else {
@@ -283,6 +328,12 @@ $.fn.sticky = function(parameters) {
         },
 
         remove: {
+          lastScroll: function() {
+            delete module.lastScroll;
+          },
+          elementScroll: function(scroll) {
+            delete module.elementScroll;
+          },
           offset: function() {
             $module.css('margin-top', '');
           }
@@ -291,7 +342,9 @@ $.fn.sticky = function(parameters) {
         set: {
           offset: function() {
             module.verbose('Setting offset on element', settings.offset);
-            $module.css('margin-top', settings.offset);
+            $module
+              .css('margin-top', settings.offset)
+            ;
           },
           containerSize: function() {
             var
@@ -300,15 +353,30 @@ $.fn.sticky = function(parameters) {
             if(tagName === 'HTML' || tagName == 'body') {
               // this can trigger for too many reasons
               //module.error(error.container, tagName, $module);
-              $container = $module.offsetParent();
+              module.determineContainer();
             }
             else {
-              module.debug('Settings container size', module.cache.context.height);
-              $container.height(module.cache.context.height);
+              if( Math.abs($container.outerHeight() - module.cache.context.height) > settings.jitter) {
+                module.debug('Context has padding, specifying exact height for container', module.cache.context.height);
+                $container.css({
+                  height: module.cache.context.height
+                });
+              }
             }
           },
+          minimumSize: function() {
+            var
+              element   = module.cache.element
+            ;
+            $container
+              .css('min-height', element.height)
+            ;
+          },
           scroll: function(scroll) {
             module.debug('Setting scroll on element', scroll);
+            if(module.elementScroll == scroll) {
+              return;
+            }
             if( module.is.top() ) {
               $module
                 .css('bottom', '')
@@ -355,8 +423,9 @@ $.fn.sticky = function(parameters) {
           }
         },
 
-        stick: function() {
+        stick: function(scroll) {
           var
+            cachedPosition = scroll || $scroll.scrollTop(),
             cache          = module.cache,
             fits           = cache.fits,
             element        = cache.element,
@@ -366,24 +435,27 @@ $.fn.sticky = function(parameters) {
               ? settings.bottomOffset
               : settings.offset,
             scroll         = {
-              top    : $scroll.scrollTop() + offset,
-              bottom : $scroll.scrollTop() + offset + window.height
+              top    : cachedPosition + offset,
+              bottom : cachedPosition + offset + window.height
             },
             direction      = module.get.direction(scroll.top),
-            elementScroll  = module.get.elementScroll(scroll.top),
+            elementScroll  = (fits)
+              ? 0
+              : module.get.elementScroll(scroll.top),
 
             // shorthand
             doesntFit      = !fits,
             elementVisible = (element.height !== 0)
           ;
 
-          // save current scroll for next run
-          module.save.scroll(scroll.top);
-
           if(elementVisible) {
 
             if( module.is.initialPosition() ) {
-              if(scroll.top >= element.top) {
+              if(scroll.top > context.bottom) {
+                module.debug('Element bottom of container');
+                module.bindBottom();
+              }
+              else if(scroll.top > element.top) {
                 module.debug('Element passed, fixing element to page');
                 module.fixTop();
               }
@@ -441,37 +513,45 @@ $.fn.sticky = function(parameters) {
               }
             }
           }
+
+          // save current scroll for next run
+          module.save.lastScroll(scroll.top);
+          module.save.elementScroll(elementScroll);
         },
 
         bindTop: function() {
           module.debug('Binding element to top of parent container');
           module.remove.offset();
           $module
-            .css('left' , '')
-            .css('top' , '')
-            .css('bottom' , '')
+            .css({
+              left         : '',
+              top          : '',
+              marginBottom : ''
+            })
             .removeClass(className.fixed)
             .removeClass(className.bottom)
             .addClass(className.bound)
             .addClass(className.top)
           ;
-          $.proxy(settings.onTop, element)();
-          $.proxy(settings.onUnstick, element)();
+          settings.onTop.call(element);
+          settings.onUnstick.call(element);
         },
         bindBottom: function() {
           module.debug('Binding element to bottom of parent container');
           module.remove.offset();
           $module
-            .css('left' , '')
-            .css('top' , '')
-            .css('bottom' , '')
+            .css({
+              left         : '',
+              top          : '',
+              marginBottom : module.cache.context.bottomPadding
+            })
             .removeClass(className.fixed)
             .removeClass(className.top)
             .addClass(className.bound)
             .addClass(className.bottom)
           ;
-          $.proxy(settings.onBottom, element)();
-          $.proxy(settings.onUnstick, element)();
+          settings.onBottom.call(element);
+          settings.onUnstick.call(element);
         },
 
         setInitialPosition: function() {
@@ -482,28 +562,38 @@ $.fn.sticky = function(parameters) {
 
         fixTop: function() {
           module.debug('Fixing element to top of page');
+          module.set.minimumSize();
           module.set.offset();
           $module
-            .css('left', module.cache.element.left)
+            .css({
+              left         : module.cache.element.left,
+              bottom       : '',
+              marginBottom : ''
+            })
             .removeClass(className.bound)
             .removeClass(className.bottom)
             .addClass(className.fixed)
             .addClass(className.top)
           ;
-          $.proxy(settings.onStick, element)();
+          settings.onStick.call(element);
         },
 
         fixBottom: function() {
           module.debug('Sticking element to bottom of page');
+          module.set.minimumSize();
           module.set.offset();
           $module
-            .css('left', module.cache.element.left)
+            .css({
+              left         : module.cache.element.left,
+              bottom       : '',
+              marginBottom : ''
+            })
             .removeClass(className.bound)
             .removeClass(className.top)
             .addClass(className.fixed)
             .addClass(className.bottom)
           ;
-          $.proxy(settings.onStick, element)();
+          settings.onStick.call(element);
         },
 
         unbind: function() {
@@ -524,7 +614,7 @@ $.fn.sticky = function(parameters) {
             .removeClass(className.top)
             .removeClass(className.bottom)
           ;
-          $.proxy(settings.onUnstick, this)();
+          settings.onUnstick.call(element);
         },
 
         reset: function() {
@@ -532,13 +622,13 @@ $.fn.sticky = function(parameters) {
           module.unbind();
           module.unfix();
           module.resetCSS();
+          module.remove.offset();
+          module.remove.lastScroll();
         },
 
         resetCSS: function() {
           $module
             .css({
-              top    : '',
-              bottom : '',
               width  : '',
               height : ''
             })
@@ -712,7 +802,7 @@ $.fn.sticky = function(parameters) {
       }
       else {
         if(instance !== undefined) {
-          module.destroy();
+          instance.invoke('destroy');
         }
         module.initialize();
       }
@@ -727,25 +817,49 @@ $.fn.sticky = function(parameters) {
 
 $.fn.sticky.settings = {
 
-  name          : 'Sticky',
-  namespace     : 'sticky',
+  name           : 'Sticky',
+  namespace      : 'sticky',
+
+  debug          : false,
+  verbose        : true,
+  performance    : true,
+
+  // whether to stick in the opposite direction on scroll up
+  pushing        : false,
+
+  context        : false,
+
+  // Context to watch scroll events
+  scrollContext  : window,
+
+  // Offset to adjust scroll
+  offset         : 0,
+
+  // Offset to adjust scroll when attached to bottom of screen
+  bottomOffset   : 0,
+
+  jitter         : 5, // will only set container height if difference between context and container is larger than this number
+
+  // Whether to automatically observe changes with Mutation Observers
+  observeChanges : false,
+
+  // Called when position is recalculated
+  onReposition   : function(){},
+
+  // Called on each scroll
+  onScroll       : function(){},
+
+  // Called when element is stuck to viewport
+  onStick        : function(){},
 
-  debug         : false,
-  verbose       : false,
-  performance   : false,
+  // Called when element is unstuck from viewport
+  onUnstick      : function(){},
 
-  pushing       : false,
-  context       : false,
-  scrollContext : window,
-  offset        : 0,
-  bottomOffset  : 0,
+  // Called when element reaches top of context
+  onTop          : function(){},
 
-  onReposition  : function(){},
-  onScroll      : function(){},
-  onStick       : function(){},
-  onUnstick     : function(){},
-  onTop         : function(){},
-  onBottom      : function(){},
+  // Called when element reaches bottom of context
+  onBottom       : function(){},
 
   error         : {
     container      : 'Sticky element must be inside a relative container',
@@ -765,4 +879,4 @@ $.fn.sticky.settings = {
 
 };
 
-})( jQuery, window , document );
+})( jQuery, window , document );