Author: jmorliaguet Date: Sat Apr 15 17:19:08 2006 New Revision: 2855 Modified: cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualactions_test.html cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualmenu_test.html Log:
- more visual fixes - test updates Modified: cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js ============================================================================== --- cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js (original) +++ cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js Sat Apr 15 17:19:08 2006 @@ -1869,7 +1869,7 @@ }, show: function() { - if (this._visible) return; + if (this._visible || !this._displayed) return; var widget = $(this.widget); CPSSkins.notify("gained focus", {'publisher': this, @@ -2037,6 +2037,7 @@ CPSSkins.Panel.prototype = Object.extend(new CPSSkins.View(), { setup: function() { + this._displayed = true; }, inspect: function() { @@ -2299,10 +2300,12 @@ var widget = this.widget; this.selected = selected; + this._displayed = true; this.show(); }, hideEvent: function(e) { + this._displayed = false; this.hide(); }, Modified: cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualactions_test.html ============================================================================== --- cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualactions_test.html (original) +++ cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualactions_test.html Sat Apr 15 17:19:08 2006 @@ -111,7 +111,7 @@ <!-- Controller --> <script type="text/javascript"> function displayChoice(event) { - var context = event.context; + var context = event.target; var options = event.options; $("message").innerHTML += Modified: cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualmenu_test.html ============================================================================== --- cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualmenu_test.html (original) +++ cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualmenu_test.html Sat Apr 15 17:19:08 2006 @@ -173,10 +173,10 @@ <!-- Controller --> <script type="text/javascript"> function displayChoice(event) { - var context = event.context; + var target = event.target; var options = event.options; $("message").innerHTML += - context.getAttribute('id') + ' => ' + options.choice + '\n'; + target.getAttribute('id') + ' => ' + options.choice + '\n'; } CPSSkins.addActions({ -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins