Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix linkify for todo title #724

Merged
merged 1 commit into from
Dec 2, 2020
Merged

Fix linkify for todo title #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
126 changes: 18 additions & 108 deletions orchestra/static/dist/main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion orchestra/static/orchestra/todos/todo-checklist.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<i class="fa fa-circle-o" aria-hidden="true" ng-if="(!todo.items || todo.items.length === 0) && showSkipped" data-nodrag></i>
<span ng-hide="!todo.items || todo.items.length < 1 || showSkipped">[{{ ( filterTodoList(todo.items, showSkipped) | filter: { completed: true } ).length }}/{{ filterTodoList(todo.items, showSkipped).length }}] </span>
<span class="todo__role">{{steps[todo.step].name}}:&nbsp;</span>
<span class="todo__description" ng-bind-html="todo.title" linkify></span>
<span class="todo__description" ng-bind-html="todo.title | linky:'_blank'"></span>
<span ng-class="{'todo__dates': true, 'todo__dates-danger': isInDanger(todo)}">
<span ng-if="isNonEmptyString(todo.start_by_datetime)">
Start <datetime-display datetime="todo.start_by_datetime" show-time="true"/>
Expand Down
3 changes: 1 addition & 2 deletions orchestra/static/orchestra/todos/todos.module.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ import todoApi from 'orchestra/todos/todos.service.es6.js'
import todoListTemplateApi from 'orchestra/todos/todolist-template.service.es6.js'
import todoQaApi from 'orchestra/todos/todo-qas.service.es6.js'
import 'angular-ui-tree'
import 'angular-linkify'

const name = 'orchestra.todos'
angular.module(name, ['ui.select', 'ngSanitize', 'ui.tree', 'linkify', common])
angular.module(name, ['ui.select', 'ngSanitize', 'ui.tree', common])
.directive('todoList', todoList)
.directive('todoChecklist', todoChecklist)
.directive('todoQa', todoQa)
Expand Down
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"devDependencies": {
"angular-smart-table": "2.1.11",
"angular-ui-tree": "2.22.6",
"angular-linkify": "2.0.0",
"babel-core": "^6.14.0",
"babel-loader": "7.1.1",
"babel-plugin-angularjs-annotate": "0.10.0",
Expand Down
5 changes: 0 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,6 @@ amdefine@>=0.0.4:
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=

angular-linkify@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/angular-linkify/-/angular-linkify-2.0.0.tgz#5c156667216110df6d19a9a7ced973445712dd22"
integrity sha1-XBVmZyFhEN9tGamnztlzRFcS3SI=

angular-smart-table@2.1.11:
version "2.1.11"
resolved "https://registry.yarnpkg.com/angular-smart-table/-/angular-smart-table-2.1.11.tgz#d0ca625f5bfb873bf3748ab861c82892e42ddfa2"
Expand Down