Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
c19c32de
Commit
c19c32de
authored
Aug 02, 2016
by
Technoboy10
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix merge conflicts from upstream/develop
parent
ed924e3b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
src/components/navigation/www/navigation.jsx
src/components/navigation/www/navigation.jsx
+7
-4
No files found.
src/components/navigation/www/navigation.jsx
View file @
c19c32de
...
...
@@ -11,6 +11,7 @@ var api = require('../../../lib/api');
var
Avatar
=
require
(
'
../../avatar/avatar.jsx
'
);
var
Button
=
require
(
'
../../forms/button.jsx
'
);
var
Dropdown
=
require
(
'
../../dropdown/dropdown.jsx
'
);
var
Form
=
require
(
'
../../forms/form.jsx
'
);
var
Input
=
require
(
'
../../forms/input.jsx
'
);
var
log
=
require
(
'
../../../lib/log.js
'
);
var
Login
=
require
(
'
../../login/login.jsx
'
);
...
...
@@ -173,6 +174,9 @@ var Navigation = React.createClass({
this
.
props
.
dispatch
(
sessionActions
.
refreshSession
());
this
.
closeRegistration
();
},
onSearchSubmit
:
function
(
formData
)
{
window
.
location
.
href
=
'
/search/projects?q=
'
+
formData
.
q
;
},
render
:
function
()
{
var
classes
=
classNames
({
'
logged-in
'
:
this
.
props
.
session
.
session
.
user
...
...
@@ -219,14 +223,13 @@ var Navigation = React.createClass({
</
MediaQuery
>
<
MediaQuery
minWidth=
{
frameless
.
desktop
}
component=
"li"
className=
"search"
>
<
form
action=
"/search/projects"
method=
"get"
>
<
Form
onSubmit=
{
this
.
onSearchSubmit
}
>
<
Button
type=
"submit"
className=
"btn-search"
/>
<
Input
type=
"text"
aria
-
label=
{
formatMessage
({
id
:
'
general.search
'
})
}
placeholder=
{
formatMessage
({
id
:
'
general.search
'
})
}
name=
"q"
noformsy
/>
</
form
>
name=
"q"
/>
</
Form
>
</
MediaQuery
>
{
this
.
props
.
session
.
status
===
sessionActions
.
Status
.
FETCHED
?
(
this
.
props
.
session
.
session
.
user
?
[
...
...
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