diff --git a/app/assets/javascripts/darkswarm/directives/hub_modal.js.coffee b/app/assets/javascripts/darkswarm/directives/hub_modal.js.coffee index 6eb0299ab4..8e42d0c835 100644 --- a/app/assets/javascripts/darkswarm/directives/hub_modal.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/hub_modal.js.coffee @@ -1,4 +1,4 @@ -Darkswarm.directive "hubModal", ($modal)-> +Darkswarm.directive "hubModal", ($modal, $document)-> restrict: 'E' replace: true template: "{{enterprise.name}}" @@ -6,3 +6,5 @@ Darkswarm.directive "hubModal", ($modal)-> elem.on "click", (ev)=> ev.stopPropagation() scope.modalInstance = $modal.open(controller: ctrl, templateUrl: 'hub_modal.html', scope: scope) + #$document.scrollTo 0, 0 + false diff --git a/app/assets/javascripts/darkswarm/directives/modal.js.coffee b/app/assets/javascripts/darkswarm/directives/modal.js.coffee index 7c1babe215..f45388cca3 100644 --- a/app/assets/javascripts/darkswarm/directives/modal.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/modal.js.coffee @@ -1,4 +1,4 @@ -Darkswarm.directive "ofnModal", ($modal)-> +Darkswarm.directive "ofnModal", ($modal, $document)-> # Generic modal! Uses transclusion so designer-types can do stuff like: # %ofn-modal # CONTENT @@ -17,3 +17,5 @@ Darkswarm.directive "ofnModal", ($modal)-> elem.on "click", => transclude scope, (clone)-> scope.modalInstance = $modal.open(controller: ctrl, template: clone, scope: scope) + #$document.scrollTo 0, 0 + false diff --git a/app/assets/javascripts/darkswarm/directives/producer_modal.js.coffee b/app/assets/javascripts/darkswarm/directives/producer_modal.js.coffee index af2b13f157..d30a807655 100644 --- a/app/assets/javascripts/darkswarm/directives/producer_modal.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/producer_modal.js.coffee @@ -1,4 +1,4 @@ -Darkswarm.directive "producerModal", ($modal)-> +Darkswarm.directive "producerModal", ($modal, $document)-> restrict: 'E' replace: true template: "" @@ -7,4 +7,5 @@ Darkswarm.directive "producerModal", ($modal)-> elem.on "click", (ev)=> ev.stopPropagation() scope.modalInstance = $modal.open(controller: ctrl, templateUrl: 'producer_modal.html', scope: scope) - + #$document.scrollTo 0, 0 + false diff --git a/app/assets/javascripts/darkswarm/services/map_modal.js.coffee b/app/assets/javascripts/darkswarm/services/map_modal.js.coffee index c9ed30f558..30e9563d7e 100644 --- a/app/assets/javascripts/darkswarm/services/map_modal.js.coffee +++ b/app/assets/javascripts/darkswarm/services/map_modal.js.coffee @@ -1,4 +1,4 @@ -Darkswarm.factory "MapModal", ($modal, $rootScope)-> +Darkswarm.factory "MapModal", ($modal, $rootScope, $document)-> new class MapModal open: (enterprise)-> scope = $rootScope.$new(true) # Spawn an isolate to contain the enterprise @@ -7,6 +7,9 @@ Darkswarm.factory "MapModal", ($modal, $rootScope)-> if enterprise.is_distributor scope.hub = enterprise $modal.open(templateUrl: "hub_modal.html", scope: scope) + #$document.scrollTo 0, 0 + else scope.producer = enterprise $modal.open(templateUrl: "map_modal_producer.html", scope: scope) + #$document.scrollTo 0, 0