xooie 1.0.1 → 1.0.2

data/README.md

@@ -30,6 +30,12 @@ Xooie will work by just loading xooie.js on your page; all other files will be l
 
 Instantiation happens automatically when the page is loaded. All HTML elements tagged with the "data-widget-type" attribute will offer the associated Xooie widget functionality.
 
+1.x vs 0.1.x:
+---
+v1.0 is our official release of Xooie. All new feature development & bug fixes occur on [master](https://github.com/Comcast/Xooie) & are released from a release_1_x branch (e.g. [release_1_1](https://github.com/Comcast/Xooie/tree/release_1_1)). So if you're just getting started with Xooie, be sure to grab the latest 1.x version.
+
+If you were already using a pre-1.0 release of Xooie, there is a [release_0_1_x branch](https://github.com/Comcast/Xooie/tree/release_0_1_x) that is updated with bug fixes only. Any 0.1.x release is from the pre-1.0 Xooie development work.
+
 Documentation:
 ---
 Carousel

data/vendor/assets/javascripts/xooie/event_handler.js

@@ -25,7 +25,7 @@ define('xooie/event_handler', ['jquery', 'xooie/helpers'], function($, helpers)
   };
 
   function format(type, namespace) {
-    if (typeof namespace === 'undefined') {
+    if (!namespace) {
       return type;
     } else {
       return type + '.' + namespace;
@@ -80,4 +80,4 @@ define('xooie/event_handler', ['jquery', 'xooie/helpers'], function($, helpers)
   };
 
   return EventHandler;
-});
+});

data/vendor/assets/javascripts/xooie/widgets/accordion.js

@@ -1,35 +1,5 @@
 define('xooie/widgets/accordion', ['jquery', 'xooie/widgets/tab'], function($, Tab){
   var Accordion = Tab.extend(function() {
-    var self = this;
-
-    this._tabEvents.clear('keyup');
-    this._tabEvents.clear('mouseup');
-
-    this._tabEvents.add({
-      keyup: function(event){
-        var activeTab = self.getActiveTabs();
-
-        if ([13,32].indexOf(event.which) !== -1){
-          if (activeTab.is(this)) {
-            self.deactivateTab($(this));
-          } else {
-            self.activateTab($(this));
-          }
-
-          event.preventDefault();
-        }
-      },
-
-      mouseup: function(){
-        var activeTab = self.getActiveTabs();
-
-        if (activeTab.is(this)) {
-          self.deactivateTab($(this));
-        } else {
-          self.activateTab($(this));
-        }
-      }
-    });
   });
 
   Accordion.define('namespace', 'accordion');
@@ -48,5 +18,15 @@ define('xooie/widgets/accordion', ['jquery', 'xooie/widgets/tab'], function($, T
     return tablist;
   };
 
+  Accordion.prototype.selectTabs = function(event, selectedTab) {
+    var activeTabs = this.getActiveTabs();
+
+    if (activeTabs.is(selectedTab)) {
+      return activeTabs.not(selectedTab);
+    } else {
+      return activeTabs.add(selectedTab);
+    }
+  };
+
   return Accordion;
-});
+});

data/vendor/assets/javascripts/xooie/widgets/carousel.js

@@ -132,8 +132,12 @@ define('xooie/widgets/carousel', ['jquery', 'xooie/helpers', 'xooie/widgets/base
           return;
         }
 
-        if (direction === 'goto' && quantity < 1 && quantity <= items.length) {
+        if (direction === 'goto' && quantity > 1 && quantity <= items.length) {
           pos = Math.round(items.eq(quantity - 1).position().left);
+
+          if (pos === 0) {
+            return;
+          }
         } else {
           i = this.currentItem(direction === 'right');
 

data/vendor/assets/javascripts/xooie/widgets/tab.js

@@ -25,6 +25,18 @@
  * visually.  Content is hidden until the associated tab is activated.
  **/
 define('xooie/widgets/tab', ['jquery', 'xooie/helpers', 'xooie/widgets/base', 'xooie/event_handler'], function($, helpers, Base, EventHandler) {
+
+  function setSelection(widget, selectedTabs) {
+    var activeTabs = widget.getActiveTabs();
+
+    activeTabs.not(selectedTabs).each(function() {
+      widget.deactivateTab($(this));
+    });
+
+    selectedTabs.not(activeTabs).each(function() {
+      widget.activateTab($(this));
+    });
+  }
 /**
  * Xooie.Tab@xooie-tab-active(event)
  * - event (Event): A jQuery event object
@@ -59,25 +71,19 @@ define('xooie/widgets/tab', ['jquery', 'xooie/helpers', 'xooie/widgets/base', 'x
 
     this._tabEvents.add({
       keyup: function(event){
-        var activeTab = self.getActiveTabs();
-
-        if ([13,32].indexOf(event.which) !== -1 && !activeTab.is(this)){
-          self.deactivateTab(activeTab);
-
-          self.activateTab($(this));
+        if ([13,32].indexOf(event.which) !== -1){
+          setSelection(self, self.selectTabs(event, $(this)));
 
           event.preventDefault();
         }
       },
 
-      mouseup: function(){
-        var activeTab = self.getActiveTabs();
-
-        if (!activeTab.is(this)) {
-          self.deactivateTab(activeTab);
+      mouseup: function(event){
+        setSelection(self, self.selectTabs(event, $(this)));
+      },
 
-          self.activateTab($(this));
-        }
+      click: function(event){
+        event.preventDefault();
       }
     });
 
@@ -204,6 +210,23 @@ define('xooie/widgets/tab', ['jquery', 'xooie/helpers', 'xooie/widgets/base', 'x
     this.root().trigger(e);
   };
 
+/**
+ * Xooie.Tab#selectTabs(event, selectedTab)
+ * - event (Event): Browser event that triggered selectTabs call
+ * - selectedTab (Element): Tab that was selected by a mouse or keyboard event
+ *
+ * Only called by mouse/keyboard event handlers to generate the list of
+ * currently active tabs. Should return a jQuery collection of tabs that are
+ * to be active. Any tabs which are currently active and not in the
+ * collection will be deactivated, and likewise any tabs not currently active
+ * and in the collection will be activated.
+ *
+ * Override this method to alter the behavior of the Tab widget.
+ **/
+  Tab.prototype.selectTabs = function(event, selectedTab) {
+    return selectedTab;
+  };
+
 /**
  * Xooie.Tab#getActiveTabs() -> Elements
  *
@@ -329,4 +352,4 @@ define('xooie/widgets/tab', ['jquery', 'xooie/helpers', 'xooie/widgets/base', 'x
   };
 
   return Tab;
-});
+});

metadata

@@ -1,70 +1,75 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: xooie
-version: !ruby/object:Gem::Version
-  version: 1.0.1
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 1.0.2
 platform: ruby
-authors:
-- Andrew Larkin
+authors: 
+  - Andrew Larkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-05 00:00:00.000000000 Z
+
+date: 2013-11-11 00:00:00 Z
 dependencies: []
+
 description: A highly modular, extensible JavaScript UI framework.
 email: andrewlarkin2@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- vendor/assets/javascripts/xooie.js
-- vendor/assets/javascripts/xooie/addons/base.js
-- vendor/assets/javascripts/xooie/addons/carousel_lentils.js
-- vendor/assets/javascripts/xooie/addons/carousel_pagination.js
-- vendor/assets/javascripts/xooie/addons/dropdown_accordion.js
-- vendor/assets/javascripts/xooie/addons/tab_animation.js
-- vendor/assets/javascripts/xooie/addons/tab_automation.js
-- vendor/assets/javascripts/xooie/base.js
-- vendor/assets/javascripts/xooie/carousel.js
-- vendor/assets/javascripts/xooie/dialog.js
-- vendor/assets/javascripts/xooie/dropdown.js
-- vendor/assets/javascripts/xooie/event_handler.js
-- vendor/assets/javascripts/xooie/helpers.js
-- vendor/assets/javascripts/xooie/keyboard_navigation.js
-- vendor/assets/javascripts/xooie/shared.js
-- vendor/assets/javascripts/xooie/stylesheet.js
-- vendor/assets/javascripts/xooie/tab.js
-- vendor/assets/javascripts/xooie/widgets/accordion.js
-- vendor/assets/javascripts/xooie/widgets/base.js
-- vendor/assets/javascripts/xooie/widgets/carousel.js
-- vendor/assets/javascripts/xooie/widgets/dialog.js
-- vendor/assets/javascripts/xooie/widgets/dropdown.js
-- vendor/assets/javascripts/xooie/widgets/tab.js
-- vendor/assets/javascripts/xooie/xooie.js
-- lib/xooie.rb
-- README.md
-- License.txt
+
+files: 
+  - vendor/assets/javascripts/xooie/event_handler.js
+  - vendor/assets/javascripts/xooie/helpers.js
+  - vendor/assets/javascripts/xooie/keyboard_navigation.js
+  - vendor/assets/javascripts/xooie/shared.js
+  - vendor/assets/javascripts/xooie/stylesheet.js
+  - vendor/assets/javascripts/xooie/xooie.js
+  - vendor/assets/javascripts/xooie/addons/base.js
+  - vendor/assets/javascripts/xooie/addons/carousel_lentils.js
+  - vendor/assets/javascripts/xooie/addons/carousel_pagination.js
+  - vendor/assets/javascripts/xooie/addons/tab_animation.js
+  - vendor/assets/javascripts/xooie/widgets/accordion.js
+  - vendor/assets/javascripts/xooie/widgets/base.js
+  - vendor/assets/javascripts/xooie/widgets/carousel.js
+  - vendor/assets/javascripts/xooie/widgets/dialog.js
+  - vendor/assets/javascripts/xooie/widgets/dropdown.js
+  - vendor/assets/javascripts/xooie/widgets/tab.js
+  - lib/xooie.rb
+  - README.md
+  - License.txt
 homepage: http://github.com/Comcast/Xooie
-licenses:
-- Apache
-metadata: {}
+licenses: 
+  - Apache
 post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.9
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A highly modular, extensible JavaScript UI framework.
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5bfa0215451441d23096e198c657f95002a8d646
-  data.tar.gz: f6a47ae7db3b4133f1ee0e704048b4e03a6c712c
-SHA512:
-  metadata.gz: f481dcef343b05cb64051d8ea384c306bff9b52b4174c155a4fb8ba8b55e805687aa5c307026af13dc48e2b2f15cac594d133c3789a43dd635b79a56a83a6381
-  data.tar.gz: c733687187db37e5c6d6a5beea8cfb2f6ae0fae51b9b2a943f2acc1926ea03e89901f534008f95ae260f63d0e620a8c9002484f670fd05aed902a7f51c99b5ee

data/vendor/assets/javascripts/xooie/addons/dropdown_accordion.js

@@ -1,38 +0,0 @@
-/*
-*   Copyright 2012 Comcast
-*
-*   Licensed under the Apache License, Version 2.0 (the "License");
-*   you may not use this file except in compliance with the License.
-*   You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-*   Unless required by applicable law or agreed to in writing, software
-*   distributed under the License is distributed on an "AS IS" BASIS,
-*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*   See the License for the specific language governing permissions and
-*   limitations under the License.
-*/
-
-define('xooie/addons/dropdown_accordion', ['jquery', 'xooie/addons/base'], function($, Base){
-
-    var Accordion = Base('accordion', function() {
-        var self = this;
-
-        this.module.getHandle().on('dropdownExpand', function(event){
-            var activeHandles = self.module.getHandle().not($(this)).filter('.' + self.module.options.activeDropdownClass),
-                i = 0,
-                index;
-
-            for (; i < activeHandles.length; i += 1) {
-                index = parseInt($(activeHandles[i]).attr('data-dropdown-index'), 10);
-
-                self.module.collapse(index, 0);
-            }
-
-        });
-    });
-
-    return Accordion;
-
-});

data/vendor/assets/javascripts/xooie/addons/tab_automation.js

@@ -1,150 +0,0 @@
-/*
-*   Copyright 2012 Comcast
-*
-*   Licensed under the Apache License, Version 2.0 (the "License");
-*   you may not use this file except in compliance with the License.
-*   You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-*   Unless required by applicable law or agreed to in writing, software
-*   distributed under the License is distributed on an "AS IS" BASIS,
-*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*   See the License for the specific language governing permissions and
-*   limitations under the License.
-*/
-
-define('xooie/addons/tab_automation', ['jquery', 'xooie/addons/base'], function($, Base) {
-    var outOfRange = function(lower, upper, point, normalize) {
-        var n = ( Math.min(lower, point) - lower ) || ( Math.max(upper, point) - upper );
-        var denominator = (normalize) ? Math.max(Math.abs(n),1) : 1;
-        return n/denominator;
-    };
-
-
-    var Automation = Base('automation', function(){
-        var self = this,
-            focusTable = {},
-            setFocus;
-
-        this._tabChangeTimer = 0;
-
-        this._canRotate = true;
-
-        //automationInstances.push(this);
-
-        setFocus = function(method, state) {
-            var prop;
-
-            focusTable[method] = state;
-
-            if (state) {
-                for (prop in focusTable) {
-                    state = state && focusTable[prop];
-                }
-            }
-
-            self._canRotate = state;
-        };
-
-        this.module.root.on({
-            'mouseenter': function(){
-                setFocus('mouse', false);
-                self.stop();
-            },
-            'focus': function(){
-                setFocus('keyboard', false);
-                self.stop();
-            },
-            'mouseleave': function(){
-                setFocus('mouse', true);
-                self.start();
-            },
-            'blur': function(){
-                setFocus('mouse', true);
-                self.start();
-            },
-            'tabChange': function(){
-                self.start();
-            }
-        });
-
-        this.module.root.find('*').on({
-           'focus': function(){
-                setFocus('keyboard', false);
-                self.stop();
-            },
-            'blur': function(){
-                setFocus('keyboard', true);
-                self.start();
-            }
-        });
-
-        this.start();
-    });
-
-    Automation.setDefaultOptions({
-        direction: 1,
-        delay: 10000
-    });
-
-    $.extend(Automation.prototype, {
-        start: function(){
-            var self = this;
-
-            if (this._tabChangeTimer) {
-                this.stop();
-            }
-
-            this._tabChangeTimer = setTimeout(function(){
-                self.stop();
-
-                if (!self._canRotate){
-                    return;
-                }
-
-                if (self.outOfRange()) {
-                    $(window).on('scroll', function(event){
-                        if (!self.outOfRange()) {
-                            self.start();
-                            $(window).off(event);
-                        }
-                        //TODO: add logic to remove scroll event if the elementis no longer in the DOM
-                    });
-                    return;
-                }
-
-                var newTab;
-
-                if (self.module._currentTab + self.options.direction >= self.module.getPanel().length) {
-                    newTab = 0;
-                } else if (self.module._currentTab + self.options.direction < 0) {
-                    newTab = self.module.getPanel().length - 1;
-                } else {
-                    newTab = self.module._currentTab + self.options.direction;
-                }
-
-                self.module.switchToTab(newTab);
-            }, this.options.delay);
-
-        },
-
-        stop: function() {
-            this._tabChangeTimer = clearTimeout(this._tabChangeTimer);
-        },
-
-        //Will return true if the tab module is out of range (ie, both the top and bottom are out of range)
-        outOfRange: function(){
-            var lower, upper, top, bottom;
-
-            lower = $(window).scrollTop();
-            upper = lower + $(window).height();
-            top = this.module.root.offset().top;
-            bottom = top + this.module.root.outerHeight(true);
-
-            return !!(outOfRange(lower, upper, top, true) && outOfRange(lower, upper, bottom, true));
-        }
-    });
-
-    return Automation;
-});