From b142d3cdcf1ed19e540aa6898d7ceb43fed8063e Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 10 Oct 2012 18:45:33 +0200 Subject: [PATCH] Close popups and menus when clicking outside of them --- assets/scripts/app/views.coffee | 11 ++++++++++- assets/scripts/app/views/repo/show.coffee | 4 +++- public/scripts/app.js | 2 +- public/scripts/min/app.js | 2 +- public/version | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/assets/scripts/app/views.coffee b/assets/scripts/app/views.coffee index c1684ac1..ebc0d6b8 100644 --- a/assets/scripts/app/views.coffee +++ b/assets/scripts/app/views.coffee @@ -16,7 +16,16 @@ require 'ext/ember/namespace' AuthLayoutView: Travis.View.extend(templateName: 'layouts/simple') ProfileLayoutView: Travis.View.extend(templateName: 'layouts/profile') StatsLayoutView: Travis.View.extend(templateName: 'layouts/simple') - ApplicationView: Travis.View.extend(templateName: 'application') + ApplicationView: Travis.View.extend + templateName: 'application' + click: (event) -> + # TODO: this solves the case of closing menus and popups, + # but I would like to rewrite it later, not sure how + # yet, but this does not seem optimal + if ! $(event.target).parents().andSelf().hasClass('popup') + @popupCloseAll() + if ! $(event.target).parents().andSelf().hasClass('menu') + $('.menu').removeClass('display') require 'views/accounts' require 'views/build' diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index 78322cf8..a5a72352 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/assets/scripts/app/views/repo/show.coffee @@ -68,9 +68,10 @@ closeMenu: -> $('.menu').removeClass('display') - menu: -> + menu: (event) -> @popupCloseAll() element = $('#tools .menu').toggleClass('display') + event.stopPropagation() requeue: -> @closeMenu() @@ -80,6 +81,7 @@ @set('active', true) @closeMenu() @popup(event) + event.stopPropagation() canPush: (-> @get('isBuildTab') && @get('build.isFinished') && @get('hasPushPermissions') diff --git a/public/scripts/app.js b/public/scripts/app.js index caeb6365..1bf092b1 100644 --- a/public/scripts/app.js +++ b/public/scripts/app.js @@ -29619,4 +29619,4 @@ var _require=function(){function c(a,c){document.addEventListener?a.addEventList ++g&&setTimeout(c,0)})}}(); (function(){!window.WebSocket&&window.MozWebSocket&&(window.WebSocket=window.MozWebSocket);if(window.WebSocket)Pusher.Transport=window.WebSocket,Pusher.TransportType="native";var c=(document.location.protocol=="http:"?Pusher.cdn_http:Pusher.cdn_https)+Pusher.VERSION,a=[];window.JSON||a.push(c+"/json2"+Pusher.dependency_suffix+".js");if(!window.WebSocket)window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION=!0,a.push(c+"/flashfallback"+Pusher.dependency_suffix+".js");var b=function(){return window.WebSocket?function(){Pusher.ready()}: function(){window.WebSocket?(Pusher.Transport=window.WebSocket,Pusher.TransportType="flash",window.WEB_SOCKET_SWF_LOCATION=c+"/WebSocketMain.swf",WebSocket.__addTask(function(){Pusher.ready()}),WebSocket.__initialize()):(Pusher.Transport=null,Pusher.TransportType="none",Pusher.ready())}}(),e=function(a){var b=function(){document.body?a():setTimeout(b,0)};b()},g=function(){e(b)};a.length>0?_require(a,g):g()})(); -;minispade.register('app', "(function() {(function() {\nminispade.require('auth');\nminispade.require('controllers');\nminispade.require('helpers');\nminispade.require('models');\nminispade.require('pusher');\nminispade.require('routes');\nminispade.require('slider');\nminispade.require('store');\nminispade.require('tailing');\nminispade.require('templates');\nminispade.require('views');\nminispade.require('config/locales');\nminispade.require('data/sponsors');\n\n Travis.reopen({\n App: Em.Application.extend({\n autoinit: false,\n currentUserBinding: 'auth.user',\n authStateBinding: 'auth.state',\n init: function() {\n this._super.apply(this, arguments);\n this.store = Travis.Store.create();\n this.store.loadMany(Travis.Sponsor, Travis.SPONSORS);\n this.set('auth', Travis.Auth.create({\n app: this,\n endpoint: Travis.config.api_endpoint\n }));\n this.slider = new Travis.Slider();\n this.pusher = new Travis.Pusher(Travis.config.pusher);\n return this.tailing = new Travis.Tailing();\n },\n signIn: function() {\n return this.get('auth').signIn();\n },\n signOut: function() {\n this.get('auth').signOut();\n return this.get('router').send('showRoot');\n },\n receive: function() {\n return this.store.receive.apply(this.store, arguments);\n },\n toggleSidebar: function() {\n var element;\n $('body').toggleClass('maximized');\n element = $('');\n $('#top .profile').append(element);\n Em.run.later((function() {\n return element.remove();\n }), 10);\n element = $('');\n $('#repo').append(element);\n return Em.run.later((function() {\n return element.remove();\n }), 10);\n }\n })\n });\n\n}).call(this);\n\n})();\n//@ sourceURL=app");minispade.register('auth', "(function() {(function() {\n\n this.Travis.Auth = Ember.Object.extend({\n iframe: $('