tao_popover 0.2.0 → 0.2.1

data/dist/tao_popover.js

@@ -209,8 +209,6 @@
 
     Element.tag = 'tao-popover';
 
-    Element.count = 0;
-
     Element.attribute('active', 'targetSelector', 'targetTraversal', 'boundarySelector', 'direction', 'arrowAlign', 'arrowVerticalAlign', {
       observe: true
     });
@@ -225,15 +223,10 @@
     });
 
     Element.prototype._init = function() {
-      this.id || (this.id = "tao-popover-" + (++this.constructor.count));
-      return this._render();
-    };
-
-    Element.prototype._render = function() {
       return this.jq.wrapInner('<div class="tao-popover-content">').append('<div class="tao-popover-arrow">\n  <i class="arrow arrow-shadow"></i>\n  <i class="arrow arrow-border"></i>\n  <i class="arrow arrow-basic"></i>\n</div>');
     };
 
-    Element.prototype._connect = function() {
+    Element.prototype._connected = function() {
       this._autoHideChanged();
       if (this.active) {
         return this.refresh();
@@ -261,7 +254,7 @@
     };
 
     Element.prototype._enableAutoHide = function() {
-      return $(document).on("mousedown." + this.id, (function(_this) {
+      return $(document).on("mousedown.tao-popover-" + this.taoId, (function(_this) {
         return function(e) {
           var target;
           if (!_this.active) {
@@ -277,7 +270,7 @@
     };
 
     Element.prototype._disableAutoHide = function() {
-      return $(document).off("mousedown." + this.id);
+      return $(document).off("mousedown.tao-popover-" + this.taoId);
     };
 
     Element.prototype.refresh = function() {
@@ -310,7 +303,7 @@
       return this.active = !this.active;
     };
 
-    Element.prototype._disconnect = function() {
+    Element.prototype._disconnected = function() {
       return this._disableAutoHide();
     };
 
@@ -344,26 +337,26 @@
       "default": 'a, button'
     });
 
-    Trigger.get('popover', function() {
-      if (this._popover != null) {
-        return this._popover;
+    Trigger.prototype._init = function() {
+      this.popover = this.jq.children('tao-popover').get(0);
+      this.popover.active = false;
+      this.popover.autoHide = this.triggerAction === 'click';
+      if (!this.popover.targetSelector) {
+        this.popover.targetSelector = '*';
       }
-      this._popover = this.jq.children('tao-popover').get(0);
-      this._popover.active = false;
-      this._popover.autoHide = this.triggerAction === 'click';
-      if (!this._popover.targetSelector) {
-        this._popover.targetSelector = '*';
+      if (!this.popover.targetTraversal) {
+        return this.popover.targetTraversal = 'prev';
       }
-      if (!this._popover.targetTraversal) {
-        this._popover.targetTraversal = 'prev';
-      }
-      return this._popover;
-    });
+    };
 
-    Trigger.prototype._connect = function() {
+    Trigger.prototype._connected = function() {
       return this._bindTriggerEvent();
     };
 
+    Trigger.prototype._disconnected = function() {
+      return this.off('.tao-popover-trigger');
+    };
+
     Trigger.prototype._bindTriggerEvent = function() {
       this.off('.tao-popover-trigger');
       if (this.triggerAction === 'click') {
@@ -395,10 +388,6 @@
       return this._bindTriggerEvent();
     };
 
-    Trigger.prototype._disconnect = function() {
-      return this.off('.tao-popover-trigger');
-    };
-
     return Trigger;
 
   })(TaoComponent);

data/lib/assets/javascripts/tao_popover/element.coffee

@@ -7,8 +7,6 @@ class TaoPopover.Element extends TaoComponent
 
   @tag: 'tao-popover'
 
-  @count: 0
-
   @attribute 'active', 'targetSelector', 'targetTraversal', 'boundarySelector', 'direction', 'arrowAlign', 'arrowVerticalAlign', observe: true
 
   @attribute 'offset', observe: true, default: 5
@@ -16,10 +14,6 @@ class TaoPopover.Element extends TaoComponent
   @attribute 'autoHide', default: true
 
   _init: ->
-    @id ||= "tao-popover-#{++@constructor.count}"
-    @_render()
-
-  _render: ->
     @jq.wrapInner '<div class="tao-popover-content">'
       .append '''
         <div class="tao-popover-arrow">
@@ -29,7 +23,7 @@ class TaoPopover.Element extends TaoComponent
         </div>
       '''
 
-  _connect: ->
+  _connected: ->
     @_autoHideChanged()
     @refresh() if @active
 
@@ -45,14 +39,14 @@ class TaoPopover.Element extends TaoComponent
     @_enableAutoHide() if @autoHide && @active
 
   _enableAutoHide: ->
-    $(document).on "mousedown.#{@id}", (e) =>
+    $(document).on "mousedown.tao-popover-#{@taoId}", (e) =>
       return unless @active
       target = $ e.target
       return if target.is(@target) or @jq.has(target).length or target.is(@)
       @active = false
 
   _disableAutoHide: ->
-    $(document).off "mousedown.#{@id}"
+    $(document).off "mousedown.tao-popover-#{@taoId}"
 
   refresh: ->
     @target = if @targetTraversal && @targetSelector
@@ -83,7 +77,7 @@ class TaoPopover.Element extends TaoComponent
   toggleActive: ->
     @active = !@active
 
-  _disconnect: ->
+  _disconnected: ->
     @_disableAutoHide()
 
 TaoComponent.register TaoPopover.Element

data/lib/assets/javascripts/tao_popover/trigger.coffee

@@ -8,20 +8,20 @@ class TaoPopover.Trigger extends TaoComponent
 
   @attribute 'triggerSelector', observe: true, default: 'a, button'
 
-  @get 'popover', ->
-    return @_popover if @_popover?
+  _init: ->
+    @popover = @jq.children('tao-popover').get(0)
+    @popover.active = false
+    @popover.autoHide = @triggerAction == 'click'
 
-    @_popover = @jq.children('tao-popover').get(0)
-    @_popover.active = false
-    @_popover.autoHide = @triggerAction == 'click'
+    @popover.targetSelector = '*' unless @popover.targetSelector
+    @popover.targetTraversal = 'prev' unless @popover.targetTraversal
 
-    @_popover.targetSelector = '*' unless @_popover.targetSelector
-    @_popover.targetTraversal = 'prev' unless @_popover.targetTraversal
-    @_popover
-
-  _connect: ->
+  _connected: ->
     @_bindTriggerEvent()
 
+  _disconnected: ->
+    @off '.tao-popover-trigger'
+
   _bindTriggerEvent: ->
     @off '.tao-popover-trigger'
 
@@ -42,7 +42,5 @@ class TaoPopover.Trigger extends TaoComponent
   _triggerSelectorChanged: ->
     @_bindTriggerEvent()
 
-  _disconnect: ->
-    @off '.tao-popover-trigger'
 
 TaoComponent.register TaoPopover.Trigger

data/lib/tao_popover/rails/version.rb

@@ -1,3 +1,3 @@
 module TaoPopover
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/tao_popover.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "tao_on_rails", '~> 0.5.0'
+  spec.add_runtime_dependency "tao_on_rails", '~> 0.6.1'
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tao_popover
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - farthinker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tao_on_rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement