Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
f79b2100
Commit
f79b2100
authored
Aug 08, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wiki popup for new page
parent
4e6f131c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
9 deletions
+4
-9
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+3
-1
app/assets/javascripts/wikis.js.coffee
app/assets/javascripts/wikis.js.coffee
+0
-7
app/views/projects/wikis/_nav.html.haml
app/views/projects/wikis/_nav.html.haml
+1
-1
No files found.
app/assets/javascripts/dispatcher.js.coffee
View file @
f79b2100
...
@@ -39,7 +39,9 @@ class Dispatcher
...
@@ -39,7 +39,9 @@ class Dispatcher
switch
path
.
first
()
switch
path
.
first
()
when
'admin'
then
new
Admin
()
when
'admin'
then
new
Admin
()
when
'wikis'
then
new
Wikis
()
when
'projects'
new
Wikis
()
if
path
[
1
]
==
'wikis'
initSearch
:
->
initSearch
:
->
autocomplete_json
=
$
(
'.search-autocomplete-json'
).
data
(
'autocomplete-opts'
)
autocomplete_json
=
$
(
'.search-autocomplete-json'
).
data
(
'autocomplete-opts'
)
...
...
app/assets/javascripts/wikis.js.coffee
View file @
f79b2100
class
Wikis
class
Wikis
constructor
:
->
constructor
:
->
modal
=
$
(
'#modal-new-wiki'
).
modal
({
modal
:
true
,
show
:
false
})
$
(
'.add-new-wiki'
).
bind
"click"
,
->
modal
.
show
()
$
(
'.build-new-wiki'
).
bind
"click"
,
->
$
(
'.build-new-wiki'
).
bind
"click"
,
->
field
=
$
(
'#new_wiki_path'
)
field
=
$
(
'#new_wiki_path'
)
slug
=
field
.
val
()
slug
=
field
.
val
()
...
@@ -13,7 +8,5 @@ class Wikis
...
@@ -13,7 +8,5 @@ class Wikis
if
(
slug
.
length
>
0
)
if
(
slug
.
length
>
0
)
location
.
href
=
path
+
"/"
+
slug
location
.
href
=
path
+
"/"
+
slug
$
(
'.modal-header .close'
).
bind
"click"
,
->
modal
.
hide
()
@
Wikis
=
Wikis
@
Wikis
=
Wikis
app/views/projects/wikis/_nav.html.haml
View file @
f79b2100
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
-
if
can?
(
current_user
,
:write_wiki
,
@project
)
-
if
can?
(
current_user
,
:write_wiki
,
@project
)
.pull-right
.pull-right
=
link_to
'#
'
,
class:
"add-new-wiki btn btn-new
"
do
=
link_to
'#
modal-new-wiki'
,
class:
"add-new-wiki btn btn-new"
,
"data-toggle"
=>
"modal
"
do
%i
.icon-plus
%i
.icon-plus
New Page
New Page
...
...
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