From 94e322edf2fe7c75c97763667fc58e62ebf57a0c Mon Sep 17 00:00:00 2001
From: Rene Saarsoo <nene@triin.net>
Date: Tue, 2 Apr 2013 13:15:56 +0300
Subject: [PATCH] Add special flag to auto-inserted Ext4 event param.

By using just the name "eOpts" we can't really be sure if the
parameter was auto-inserted or manually added by user.
---
 lib/jsduck/process/ext4_events.rb     | 3 ++-
 lib/jsduck/process/inherit_members.rb | 4 ++--
 spec/aggregator_ext4_events_spec.rb   | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/jsduck/process/ext4_events.rb b/lib/jsduck/process/ext4_events.rb
index 78f5f84d..302060b9 100644
--- a/lib/jsduck/process/ext4_events.rb
+++ b/lib/jsduck/process/ext4_events.rb
@@ -34,7 +34,8 @@ module JsDuck
         :tagname => :params,
         :name => "eOpts",
         :type => "Object",
-        :doc => "The options object passed to {@link Ext.util.Observable#addListener}."
+        :doc => "The options object passed to {@link Ext.util.Observable#addListener}.",
+        :ext4_auto_param => true,
       }
 
     end
diff --git a/lib/jsduck/process/inherit_members.rb b/lib/jsduck/process/inherit_members.rb
index 8c1813ee..29a9b160 100644
--- a/lib/jsduck/process/inherit_members.rb
+++ b/lib/jsduck/process/inherit_members.rb
@@ -92,8 +92,8 @@ module JsDuck
       end
 
       def inherit_params?(m, parent)
-        # ignore the eOpts auto-inserted param of Ext4-style events
-        params = (m[:params] || []).reject {|p| p[:name] == "eOpts" }
+        # ignore the auto-inserted param of Ext4-style events
+        params = (m[:params] || []).reject {|p| p[:ext4_auto_param] }
 
         if params.length > 0 && !auto?(m, :params)
           # member itself has params and these are not auto-detected
diff --git a/spec/aggregator_ext4_events_spec.rb b/spec/aggregator_ext4_events_spec.rb
index 549d3c9a..6c137ab9 100644
--- a/spec/aggregator_ext4_events_spec.rb
+++ b/spec/aggregator_ext4_events_spec.rb
@@ -34,6 +34,10 @@ describe JsDuck::Aggregator do
     it "with standard description" do
       event[:params][2][:doc].should =~ /The options object passed to.*addListener/
     end
+
+    it "with special :ext4event flag" do
+      event[:params][2][:ext4_auto_param].should == true
+    end
   end
 
   describe "When some class defined with Ext.define" do
-- 
GitLab