From 9f26214142ba92142efe56f696e84c71b2f2d5a6 Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 28 Jul 2014 17:11:15 +0100 Subject: [PATCH 1/3] Fix double context menu in FF --- .../directives/aceEditor/spell-check/SpellCheckManager.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee index adaedd458f..5782f74ba7 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee @@ -25,6 +25,7 @@ define [ @$scope.spellingMenu = {left: '0px', top: '0px'} @editor.on "nativecontextmenu", (e) => + e.domEvent.stopPropagation(); @closeContextMenu(e.domEvent) @openContextMenu(e.domEvent) @@ -74,6 +75,7 @@ define [ @$scope.spellingMenu.open = true @$scope.spellingMenu.left = e.clientX + 'px' @$scope.spellingMenu.top = e.clientY + 'px' + return false closeContextMenu: (e) -> @$scope.$apply () => From fc7753d49d94acf603da5856d9b09aebf6d6ea7c Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 28 Jul 2014 17:24:43 +0100 Subject: [PATCH 2/3] Add in download PDF button --- services/web/app/views/project/editor/pdf.jade | 9 +++++++++ services/web/public/stylesheets/app/editor/toolbar.less | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/services/web/app/views/project/editor/pdf.jade b/services/web/app/views/project/editor/pdf.jade index 566f5fd294..0af9b60425 100644 --- a/services/web/app/views/project/editor/pdf.jade +++ b/services/web/app/views/project/editor/pdf.jade @@ -27,6 +27,15 @@ div.full-size.pdf(ng-controller="PdfController") }" ) {{ pdf.logEntries.errors.length + pdf.logEntries.warnings.length }} + a( + ng-href="{{pdf.url}}" + target="_blank" + ng-if="pdf.url" + tooltip="Download PDF" + tooltip-placement="bottom" + ) + i.fa.fa-download + .toolbar-right a( href, diff --git a/services/web/public/stylesheets/app/editor/toolbar.less b/services/web/public/stylesheets/app/editor/toolbar.less index 0ccf634b59..2b63b41a10 100644 --- a/services/web/public/stylesheets/app/editor/toolbar.less +++ b/services/web/public/stylesheets/app/editor/toolbar.less @@ -94,8 +94,10 @@ &.toolbar-tall { height: 58px; padding-top: 10px; + a.btn { + margin: 0 (@line-height-computed / 2); + } a { - margin-left: (@line-height-computed / 2); padding: 4px 10px 5px; } } From 714266b16e851bb37531b784dbba55f2d2b8bf37 Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 28 Jul 2014 17:28:52 +0100 Subject: [PATCH 3/3] Fix infinite scroll --- .../coffee/ide/track-changes/directives/infiniteScroll.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/track-changes/directives/infiniteScroll.coffee b/services/web/public/coffee/ide/track-changes/directives/infiniteScroll.coffee index 65b1ac51eb..6ecbd6d427 100644 --- a/services/web/public/coffee/ide/track-changes/directives/infiniteScroll.coffee +++ b/services/web/public/coffee/ide/track-changes/directives/infiniteScroll.coffee @@ -11,7 +11,7 @@ define [ if attrs.infiniteScrollUpwards? atTopOfListView() else - atBottomOfList() + atBottomOfListView() atTopOfListView = () -> element.scrollTop() < 30