From 49a1489f31330dfa5fa0bca8cedf1c363495b483 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 4 Jul 2014 13:41:18 +0200 Subject: [PATCH] Removing edit | preview bar from popups --- app/coffee/modules/backlog/lightboxes.coffee | 29 ------------------- .../modules/taskboard/lightboxes.coffee | 28 ------------------ .../views/modules/lightbox_add-edit-task.jade | 4 --- .../views/modules/lightbox_add-issue.jade | 4 --- .../views/modules/lightbox_add-new-us.jade | 4 --- 5 files changed, 69 deletions(-) diff --git a/app/coffee/modules/backlog/lightboxes.coffee b/app/coffee/modules/backlog/lightboxes.coffee index ece3ef97..f23bfcf1 100644 --- a/app/coffee/modules/backlog/lightboxes.coffee +++ b/app/coffee/modules/backlog/lightboxes.coffee @@ -23,25 +23,6 @@ taiga = @.taiga bindOnce = @.taiga.bindOnce CreateEditUserstoryDirective = ($repo, $model, $rs, $rootScope) -> - - editDescription = ($scope, $el) -> - $el.find('.markdown-preview a').removeClass("active") - $el.find('.markdown-preview a.edit').addClass("active") - descriptionDOM = $el.find("textarea.description") - descriptionPreviewDOM = $el.find(".description-preview") - descriptionDOM.show() - descriptionPreviewDOM.hide() - - previewDescription = ($scope, $el) -> - $el.find('.markdown-preview a').removeClass("active") - $el.find('.markdown-preview a.preview').addClass("active") - descriptionDOM = $el.find("textarea.description") - descriptionPreviewDOM = $el.find(".description-preview") - $rs.mdrender.render($scope.projectId, $scope.us.description).then (data) -> - descriptionDOM.hide() - descriptionPreviewDOM.html(data.data) - descriptionPreviewDOM.show() - link = ($scope, $el, attrs) -> isNew = true @@ -52,7 +33,6 @@ CreateEditUserstoryDirective = ($repo, $model, $rs, $rootScope) -> status: $scope.project.default_us_status } isNew = true - editDescription($scope, $el) # Update texts for creation $el.find(".button-green span").html("Create") #TODO: i18n $el.find(".title").html("New user story ") #TODO: i18n @@ -61,7 +41,6 @@ CreateEditUserstoryDirective = ($repo, $model, $rs, $rootScope) -> $scope.$on "usform:edit", (ctx, us) -> $scope.us = us isNew = false - editDescription($scope, $el) # Update texts for edition $el.find(".button-green span").html("Save") #TODO: i18n $el.find(".title").html("Edit user story ") #TODO: i18n @@ -81,14 +60,6 @@ CreateEditUserstoryDirective = ($repo, $model, $rs, $rootScope) -> # Dom Event Handlers - $el.on "click", ".markdown-preview a.edit", (event) -> - event.preventDefault() - editDescription($scope, $el) - - $el.on "click", ".markdown-preview a.preview", (event) -> - event.preventDefault() - previewDescription($scope, $el) - $el.on "click", ".close", (event) -> event.preventDefault() $el.addClass("hidden") diff --git a/app/coffee/modules/taskboard/lightboxes.coffee b/app/coffee/modules/taskboard/lightboxes.coffee index 3d9505ae..252694dd 100644 --- a/app/coffee/modules/taskboard/lightboxes.coffee +++ b/app/coffee/modules/taskboard/lightboxes.coffee @@ -23,24 +23,6 @@ taiga = @.taiga bindOnce = @.taiga.bindOnce CreateEditTaskDirective = ($repo, $model, $rs, $rootScope) -> - editDescription = ($scope, $el) -> - $el.find('.markdown-preview a').removeClass("active") - $el.find('.markdown-preview a.edit').addClass("active") - descriptionDOM = $el.find("textarea.description") - descriptionPreviewDOM = $el.find(".description-preview") - descriptionDOM.show() - descriptionPreviewDOM.hide() - - previewDescription = ($scope, $el) -> - $el.find('.markdown-preview a').removeClass("active") - $el.find('.markdown-preview a.preview').addClass("active") - descriptionDOM = $el.find("textarea.description") - descriptionPreviewDOM = $el.find(".description-preview") - $rs.mdrender.render($scope.projectId, $scope.task.description).then (data) -> - descriptionDOM.hide() - descriptionPreviewDOM.html(data.data) - descriptionPreviewDOM.show() - link = ($scope, $el, attrs) -> isNew = true @@ -54,7 +36,6 @@ CreateEditTaskDirective = ($repo, $model, $rs, $rootScope) -> assigned_to: null } isNew = true - editDescription($scope, $el) # Update texts for creation $el.find(".button-green span").html("Create") #TODO: i18n $el.find(".title").html("New task ") #TODO: i18n @@ -63,7 +44,6 @@ CreateEditTaskDirective = ($repo, $model, $rs, $rootScope) -> $scope.$on "taskform:edit", (ctx, task) -> $scope.task = task isNew = false - editDescription($scope, $el) # Update texts for edition $el.find(".button-green span").html("Save") #TODO: i18n $el.find(".title").html("Edit task ") #TODO: i18n @@ -81,14 +61,6 @@ CreateEditTaskDirective = ($repo, $model, $rs, $rootScope) -> # Dom Event Handlers - $el.on "click", ".markdown-preview a.edit", (event) -> - event.preventDefault() - editDescription($scope, $el) - - $el.on "click", ".markdown-preview a.preview", (event) -> - event.preventDefault() - previewDescription($scope, $el) - $el.on "click", ".close", (event) -> event.preventDefault() $el.addClass("hidden") diff --git a/app/partials/views/modules/lightbox_add-edit-task.jade b/app/partials/views/modules/lightbox_add-edit-task.jade index cc0e0e46..1ccf55a9 100644 --- a/app/partials/views/modules/lightbox_add-edit-task.jade +++ b/app/partials/views/modules/lightbox_add-edit-task.jade @@ -14,11 +14,7 @@ form fieldset input(type="text", placeholder="Tags", tg-tags, ng-model="task.tags") fieldset - div.markdown-preview - a.edit.active(href="", title="Edit") Edit - a.preview(href="", title="Preview") Preview textarea.description(placeholder="Type a short description", ng-model="task.description") - div.description-preview.hidden div.new-us-settings fieldset label.iocaine diff --git a/app/partials/views/modules/lightbox_add-issue.jade b/app/partials/views/modules/lightbox_add-issue.jade index 5280e634..afcd2ce1 100644 --- a/app/partials/views/modules/lightbox_add-issue.jade +++ b/app/partials/views/modules/lightbox_add-issue.jade @@ -28,11 +28,7 @@ form fieldset input(type="text", placeholder="Add tags") fieldset - div.markdown-preview - a.edit.active(href="", title="Edit") Edit - a.preview(href="", title="Preview") Preview textarea.description(placeholder="description") - div.description-preview.hidden include lightbox-attachments a.button.button-green(href="", title="Save") span Create diff --git a/app/partials/views/modules/lightbox_add-new-us.jade b/app/partials/views/modules/lightbox_add-new-us.jade index 7603ab58..cccb2dda 100644 --- a/app/partials/views/modules/lightbox_add-new-us.jade +++ b/app/partials/views/modules/lightbox_add-new-us.jade @@ -10,11 +10,7 @@ form fieldset input(type="text", placeholder="Tags", tg-tags, ng-model="us.tags") fieldset - div.markdown-preview - a.edit.active(href="", title="Edit") Edit - a.preview(href="", title="Preview") Preview textarea.description(placeholder="One user story per line", ng-model="us.description") - div.description-preview.hidden div.new-us-settings fieldset label.requirement.team-requirement(for="team-requirement", tg-i18n="us.team-requirement")