BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
94743e0e
Unverified
Commit
94743e0e
authored
Oct 26, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove issuable form from global namespace
parent
a665a354
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
98 additions
and
102 deletions
+98
-102
board_sidebar.js
app/assets/javascripts/boards/components/board_sidebar.js
+1
-1
dispatcher.js
app/assets/javascripts/dispatcher.js
+1
-1
issuable_form.js
app/assets/javascripts/issuable_form.js
+96
-99
labels_issue_sidebar_spec.js
spec/javascripts/labels_issue_sidebar_spec.js
+0
-1
No files found.
app/assets/javascripts/boards/components/board_sidebar.js
View file @
94743e0e
/* eslint-disable comma-dangle, space-before-function-paren, no-new */
import
IssuableContext
from
'../../issuable_context'
;
/* global MilestoneSelect */
/* global LabelsSelect */
/* global Sidebar */
...
...
@@ -11,6 +10,7 @@ import AssigneeTitle from '../../sidebar/components/assignees/assignee_title';
import
Assignees
from
'../../sidebar/components/assignees/assignees'
;
import
DueDateSelectors
from
'../../due_date_select'
;
import
'./sidebar/remove_issue'
;
import
IssuableContext
from
'../../issuable_context'
;
const
Store
=
gl
.
issueBoards
.
BoardsStore
;
...
...
app/assets/javascripts/dispatcher.js
View file @
94743e0e
...
...
@@ -2,7 +2,7 @@
/* global ProjectSelect */
import
IssuableIndex
from
'./issuable_index'
;
/* global Milestone */
/* global IssuableForm */
import
IssuableForm
from
'./issuable_form'
;
/* global LabelsSelect */
/* global MilestoneSelect */
/* global NewBranchForm */
...
...
app/assets/javascripts/issuable_form.js
View file @
94743e0e
/* eslint-disable func-names,
space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-use-before-define, no-useless-escape, no-new, quotes
, object-shorthand, no-unused-vars, comma-dangle, no-alert, consistent-return, no-else-return, prefer-template, one-var, one-var-declaration-per-line, curly, max-len */
/* eslint-disable func-names,
prefer-rest-params, wrap-iife, no-use-before-define, no-useless-escape, no-new
, object-shorthand, no-unused-vars, comma-dangle, no-alert, consistent-return, no-else-return, prefer-template, one-var, one-var-declaration-per-line, curly, max-len */
/* global GitLab */
/* global Autosave */
...
...
@@ -8,103 +8,100 @@ import GfmAutoComplete from './gfm_auto_complete';
import
ZenMode
from
'./zen_mode'
;
import
{
parsePikadayDate
,
pikadayToString
}
from
'./lib/utils/datefix'
;
(
function
()
{
this
.
IssuableForm
=
(
function
()
{
IssuableForm
.
prototype
.
wipRegex
=
/^
\s
*
(\[
WIP
\]\s
*|WIP:
\s
*|WIP
\s
+
)
+
\s
*/i
;
function
IssuableForm
(
form
)
{
var
$issuableDueDate
,
calendar
;
this
.
form
=
form
;
this
.
toggleWip
=
this
.
toggleWip
.
bind
(
this
);
this
.
renderWipExplanation
=
this
.
renderWipExplanation
.
bind
(
this
);
this
.
resetAutosave
=
this
.
resetAutosave
.
bind
(
this
);
this
.
handleSubmit
=
this
.
handleSubmit
.
bind
(
this
);
new
GfmAutoComplete
(
gl
.
GfmAutoComplete
&&
gl
.
GfmAutoComplete
.
dataSources
).
setup
();
new
UsersSelect
();
new
ZenMode
();
this
.
titleField
=
this
.
form
.
find
(
"input[name*='[title]']"
);
this
.
descriptionField
=
this
.
form
.
find
(
"textarea[name*='[description]']"
);
if
(
!
(
this
.
titleField
.
length
&&
this
.
descriptionField
.
length
))
{
return
;
}
this
.
initAutosave
();
this
.
form
.
on
(
"submit"
,
this
.
handleSubmit
);
this
.
form
.
on
(
"click"
,
".btn-cancel"
,
this
.
resetAutosave
);
this
.
initWip
();
$issuableDueDate
=
$
(
'#issuable-due-date'
);
if
(
$issuableDueDate
.
length
)
{
calendar
=
new
Pikaday
({
field
:
$issuableDueDate
.
get
(
0
),
theme
:
'gitlab-theme animate-picker'
,
format
:
'yyyy-mm-dd'
,
container
:
$issuableDueDate
.
parent
().
get
(
0
),
parse
:
dateString
=>
parsePikadayDate
(
dateString
),
toString
:
date
=>
pikadayToString
(
date
),
onSelect
:
function
(
dateText
)
{
$issuableDueDate
.
val
(
calendar
.
toString
(
dateText
));
}
});
calendar
.
setDate
(
parsePikadayDate
(
$issuableDueDate
.
val
()));
}
export
default
class
IssuableForm
{
constructor
(
form
)
{
this
.
form
=
form
;
this
.
toggleWip
=
this
.
toggleWip
.
bind
(
this
);
this
.
renderWipExplanation
=
this
.
renderWipExplanation
.
bind
(
this
);
this
.
resetAutosave
=
this
.
resetAutosave
.
bind
(
this
);
this
.
handleSubmit
=
this
.
handleSubmit
.
bind
(
this
);
this
.
wipRegex
=
/^
\s
*
(\[
WIP
\]\s
*|WIP:
\s
*|WIP
\s
+
)
+
\s
*/i
;
new
GfmAutoComplete
(
gl
.
GfmAutoComplete
&&
gl
.
GfmAutoComplete
.
dataSources
).
setup
();
new
UsersSelect
();
new
ZenMode
();
this
.
titleField
=
this
.
form
.
find
(
'input[name*="[title]"]'
);
this
.
descriptionField
=
this
.
form
.
find
(
'textarea[name*="[description]"]'
);
if
(
!
(
this
.
titleField
.
length
&&
this
.
descriptionField
.
length
))
{
return
;
}
IssuableForm
.
prototype
.
initAutosave
=
function
()
{
new
Autosave
(
this
.
titleField
,
[
document
.
location
.
pathname
,
document
.
location
.
search
,
"title"
]);
return
new
Autosave
(
this
.
descriptionField
,
[
document
.
location
.
pathname
,
document
.
location
.
search
,
"description"
]);
};
IssuableForm
.
prototype
.
handleSubmit
=
function
()
{
return
this
.
resetAutosave
();
};
IssuableForm
.
prototype
.
resetAutosave
=
function
()
{
this
.
titleField
.
data
(
"autosave"
).
reset
();
return
this
.
descriptionField
.
data
(
"autosave"
).
reset
();
};
IssuableForm
.
prototype
.
initWip
=
function
()
{
this
.
$wipExplanation
=
this
.
form
.
find
(
".js-wip-explanation"
);
this
.
$noWipExplanation
=
this
.
form
.
find
(
".js-no-wip-explanation"
);
if
(
!
(
this
.
$wipExplanation
.
length
&&
this
.
$noWipExplanation
.
length
))
{
return
;
}
this
.
form
.
on
(
"click"
,
".js-toggle-wip"
,
this
.
toggleWip
);
this
.
titleField
.
on
(
"keyup blur"
,
this
.
renderWipExplanation
);
return
this
.
renderWipExplanation
();
};
IssuableForm
.
prototype
.
workInProgress
=
function
()
{
return
this
.
wipRegex
.
test
(
this
.
titleField
.
val
());
};
IssuableForm
.
prototype
.
renderWipExplanation
=
function
()
{
if
(
this
.
workInProgress
())
{
this
.
$wipExplanation
.
show
();
return
this
.
$noWipExplanation
.
hide
();
}
else
{
this
.
$wipExplanation
.
hide
();
return
this
.
$noWipExplanation
.
show
();
}
};
IssuableForm
.
prototype
.
toggleWip
=
function
(
event
)
{
event
.
preventDefault
();
if
(
this
.
workInProgress
())
{
this
.
removeWip
();
}
else
{
this
.
addWip
();
}
return
this
.
renderWipExplanation
();
};
IssuableForm
.
prototype
.
removeWip
=
function
()
{
return
this
.
titleField
.
val
(
this
.
titleField
.
val
().
replace
(
this
.
wipRegex
,
""
));
};
IssuableForm
.
prototype
.
addWip
=
function
()
{
return
this
.
titleField
.
val
(
"WIP: "
+
(
this
.
titleField
.
val
()));
};
return
IssuableForm
;
})();
}).
call
(
window
);
this
.
initAutosave
();
this
.
form
.
on
(
'submit'
,
this
.
handleSubmit
);
this
.
form
.
on
(
'click'
,
'.btn-cancel'
,
this
.
resetAutosave
);
this
.
initWip
();
const
$issuableDueDate
=
$
(
'#issuable-due-date'
);
if
(
$issuableDueDate
.
length
)
{
const
calendar
=
new
Pikaday
({
field
:
$issuableDueDate
.
get
(
0
),
theme
:
'gitlab-theme animate-picker'
,
format
:
'yyyy-mm-dd'
,
container
:
$issuableDueDate
.
parent
().
get
(
0
),
parse
:
dateString
=>
parsePikadayDate
(
dateString
),
toString
:
date
=>
pikadayToString
(
date
),
onSelect
:
dateText
=>
$issuableDueDate
.
val
(
calendar
.
toString
(
dateText
)),
});
calendar
.
setDate
(
parsePikadayDate
(
$issuableDueDate
.
val
()));
}
}
initAutosave
()
{
new
Autosave
(
this
.
titleField
,
[
document
.
location
.
pathname
,
document
.
location
.
search
,
'title'
]);
return
new
Autosave
(
this
.
descriptionField
,
[
document
.
location
.
pathname
,
document
.
location
.
search
,
'description'
]);
}
handleSubmit
()
{
return
this
.
resetAutosave
();
}
resetAutosave
()
{
this
.
titleField
.
data
(
'autosave'
).
reset
();
return
this
.
descriptionField
.
data
(
'autosave'
).
reset
();
}
initWip
()
{
this
.
$wipExplanation
=
this
.
form
.
find
(
'.js-wip-explanation'
);
this
.
$noWipExplanation
=
this
.
form
.
find
(
'.js-no-wip-explanation'
);
if
(
!
(
this
.
$wipExplanation
.
length
&&
this
.
$noWipExplanation
.
length
))
{
return
;
}
this
.
form
.
on
(
'click'
,
'.js-toggle-wip'
,
this
.
toggleWip
);
this
.
titleField
.
on
(
'keyup blur'
,
this
.
renderWipExplanation
);
return
this
.
renderWipExplanation
();
}
workInProgress
()
{
return
this
.
wipRegex
.
test
(
this
.
titleField
.
val
());
}
renderWipExplanation
()
{
if
(
this
.
workInProgress
())
{
this
.
$wipExplanation
.
show
();
return
this
.
$noWipExplanation
.
hide
();
}
else
{
this
.
$wipExplanation
.
hide
();
return
this
.
$noWipExplanation
.
show
();
}
}
toggleWip
(
event
)
{
event
.
preventDefault
();
if
(
this
.
workInProgress
())
{
this
.
removeWip
();
}
else
{
this
.
addWip
();
}
return
this
.
renderWipExplanation
();
}
removeWip
()
{
return
this
.
titleField
.
val
(
this
.
titleField
.
val
().
replace
(
this
.
wipRegex
,
''
));
}
addWip
()
{
this
.
titleField
.
val
(
`WIP:
${(
this
.
titleField
.
val
())}
`
);
}
}
spec/javascripts/labels_issue_sidebar_spec.js
View file @
94743e0e
...
...
@@ -6,7 +6,6 @@ import '~/gl_dropdown';
import
'select2'
;
import
'~/api'
;
import
'~/create_label'
;
import
'~/issuable_context'
;
import
'~/users_select'
;
import
'~/labels_select'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment