Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f8520f5d
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f8520f5d
编写于
10月 24, 2016
作者:
M
Mike Greiling
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove manual Cookie.set "path" option in favor of global setting
上级
1c0213f2
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
9 addition
and
53 deletion
+9
-53
app/assets/javascripts/activities.js
app/assets/javascripts/activities.js
+1
-3
app/assets/javascripts/awards_handler.js
app/assets/javascripts/awards_handler.js
+1
-4
app/assets/javascripts/cycle_analytics.js.es6
app/assets/javascripts/cycle_analytics.js.es6
+1
-3
app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
...s/javascripts/merge_conflicts/merge_conflict_store.js.es6
+1
-3
app/assets/javascripts/project.js
app/assets/javascripts/project.js
+2
-6
app/assets/javascripts/right_sidebar.js
app/assets/javascripts/right_sidebar.js
+1
-3
app/assets/javascripts/sidebar.js.es6
app/assets/javascripts/sidebar.js.es6
+1
-4
app/assets/javascripts/user.js.es6
app/assets/javascripts/user.js.es6
+1
-4
spec/javascripts/awards_handler_spec.js
spec/javascripts/awards_handler_spec.js
+0
-23
未找到文件。
app/assets/javascripts/activities.js
浏览文件 @
f8520f5d
...
@@ -24,9 +24,7 @@
...
@@ -24,9 +24,7 @@
var
filter
=
sender
.
attr
(
"
id
"
).
split
(
"
_
"
)[
0
];
var
filter
=
sender
.
attr
(
"
id
"
).
split
(
"
_
"
)[
0
];
$
(
'
.event-filter .active
'
).
removeClass
(
"
active
"
);
$
(
'
.event-filter .active
'
).
removeClass
(
"
active
"
);
Cookies
.
set
(
"
event_filter
"
,
filter
,
{
Cookies
.
set
(
"
event_filter
"
,
filter
);
path
:
gon
.
relative_url_root
||
'
/
'
});
sender
.
closest
(
'
li
'
).
toggleClass
(
"
active
"
);
sender
.
closest
(
'
li
'
).
toggleClass
(
"
active
"
);
};
};
...
...
app/assets/javascripts/awards_handler.js
浏览文件 @
f8520f5d
...
@@ -322,10 +322,7 @@
...
@@ -322,10 +322,7 @@
var
frequentlyUsedEmojis
;
var
frequentlyUsedEmojis
;
frequentlyUsedEmojis
=
this
.
getFrequentlyUsedEmojis
();
frequentlyUsedEmojis
=
this
.
getFrequentlyUsedEmojis
();
frequentlyUsedEmojis
.
push
(
emoji
);
frequentlyUsedEmojis
.
push
(
emoji
);
Cookies
.
set
(
'
frequently_used_emojis
'
,
frequentlyUsedEmojis
.
join
(
'
,
'
),
{
Cookies
.
set
(
'
frequently_used_emojis
'
,
frequentlyUsedEmojis
.
join
(
'
,
'
),
{
expires
:
365
});
path
:
gon
.
relative_url_root
||
'
/
'
,
expires
:
365
});
};
};
AwardsHandler
.
prototype
.
getFrequentlyUsedEmojis
=
function
()
{
AwardsHandler
.
prototype
.
getFrequentlyUsedEmojis
=
function
()
{
...
...
app/assets/javascripts/cycle_analytics.js.es6
浏览文件 @
f8520f5d
...
@@ -75,9 +75,7 @@
...
@@ -75,9 +75,7 @@
dismissLanding() {
dismissLanding() {
store.isHelpDismissed = true;
store.isHelpDismissed = true;
Cookies.set(COOKIE_NAME, true, {
Cookies.set(COOKIE_NAME, true);
path: gon.relative_url_root || '/'
});
}
}
initDropdown() {
initDropdown() {
...
...
app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
浏览文件 @
f8520f5d
...
@@ -180,9 +180,7 @@
...
@@ -180,9 +180,7 @@
this.state.diffView = viewType;
this.state.diffView = viewType;
this.state.isParallel = viewType === VIEW_TYPES.PARALLEL;
this.state.isParallel = viewType === VIEW_TYPES.PARALLEL;
Cookies.set('diff_view', viewType, {
Cookies.set('diff_view', viewType);
path: gon.relative_url_root || '/'
});
},
},
getHeadHeaderLine(id) {
getHeadHeaderLine(id) {
...
...
app/assets/javascripts/project.js
浏览文件 @
f8520f5d
...
@@ -23,16 +23,12 @@
...
@@ -23,16 +23,12 @@
return
$
(
this
).
parents
(
'
form
'
).
submit
();
return
$
(
this
).
parents
(
'
form
'
).
submit
();
});
});
$
(
'
.hide-no-ssh-message
'
).
on
(
'
click
'
,
function
(
e
)
{
$
(
'
.hide-no-ssh-message
'
).
on
(
'
click
'
,
function
(
e
)
{
Cookies
.
set
(
'
hide_no_ssh_message
'
,
'
false
'
,
{
Cookies
.
set
(
'
hide_no_ssh_message
'
,
'
false
'
);
path
:
gon
.
relative_url_root
||
'
/
'
});
$
(
this
).
parents
(
'
.no-ssh-key-message
'
).
remove
();
$
(
this
).
parents
(
'
.no-ssh-key-message
'
).
remove
();
return
e
.
preventDefault
();
return
e
.
preventDefault
();
});
});
$
(
'
.hide-no-password-message
'
).
on
(
'
click
'
,
function
(
e
)
{
$
(
'
.hide-no-password-message
'
).
on
(
'
click
'
,
function
(
e
)
{
Cookies
.
set
(
'
hide_no_password_message
'
,
'
false
'
,
{
Cookies
.
set
(
'
hide_no_password_message
'
,
'
false
'
);
path
:
gon
.
relative_url_root
||
'
/
'
});
$
(
this
).
parents
(
'
.no-password-message
'
).
remove
();
$
(
this
).
parents
(
'
.no-password-message
'
).
remove
();
return
e
.
preventDefault
();
return
e
.
preventDefault
();
});
});
...
...
app/assets/javascripts/right_sidebar.js
浏览文件 @
f8520f5d
...
@@ -29,9 +29,7 @@
...
@@ -29,9 +29,7 @@
$
(
'
.page-with-sidebar
'
).
removeClass
(
'
right-sidebar-collapsed
'
).
addClass
(
'
right-sidebar-expanded
'
);
$
(
'
.page-with-sidebar
'
).
removeClass
(
'
right-sidebar-collapsed
'
).
addClass
(
'
right-sidebar-expanded
'
);
}
}
if
(
!
triggered
)
{
if
(
!
triggered
)
{
return
Cookies
.
set
(
"
collapsed_gutter
"
,
$
(
'
.right-sidebar
'
).
hasClass
(
'
right-sidebar-collapsed
'
),
{
return
Cookies
.
set
(
"
collapsed_gutter
"
,
$
(
'
.right-sidebar
'
).
hasClass
(
'
right-sidebar-collapsed
'
));
path
:
gon
.
relative_url_root
||
'
/
'
});
}
}
});
});
return
$
(
document
).
off
(
'
click
'
,
'
.js-issuable-todo
'
).
on
(
'
click
'
,
'
.js-issuable-todo
'
,
this
.
toggleTodo
);
return
$
(
document
).
off
(
'
click
'
,
'
.js-issuable-todo
'
).
on
(
'
click
'
,
'
.js-issuable-todo
'
,
this
.
toggleTodo
);
...
...
app/assets/javascripts/sidebar.js.es6
浏览文件 @
f8520f5d
...
@@ -62,10 +62,7 @@
...
@@ -62,10 +62,7 @@
if (!this.isPinned) {
if (!this.isPinned) {
this.isExpanded = false;
this.isExpanded = false;
}
}
Cookies.set(pinnedStateCookie, this.isPinned ? 'true' : 'false', {
Cookies.set(pinnedStateCookie, this.isPinned ? 'true' : 'false', { expires: 3650 });
path: gon.relative_url_root || '/',
expires: 3650
});
this.renderState();
this.renderState();
}
}
...
...
app/assets/javascripts/user.js.es6
浏览文件 @
f8520f5d
...
@@ -23,10 +23,7 @@
...
@@ -23,10 +23,7 @@
hideProjectLimitMessage() {
hideProjectLimitMessage() {
$('.hide-project-limit-message').on('click', e => {
$('.hide-project-limit-message').on('click', e => {
e.preventDefault();
e.preventDefault();
const path = gon.relative_url_root || '/';
Cookies.set('hide_project_limit_message', 'false');
Cookies.set('hide_project_limit_message', 'false', {
path: path
});
$(this).parents('.project-limit-message').remove();
$(this).parents('.project-limit-message').remove();
});
});
}
}
...
...
spec/javascripts/awards_handler_spec.js
浏览文件 @
f8520f5d
...
@@ -44,7 +44,6 @@
...
@@ -44,7 +44,6 @@
spyOn
(
jQuery
,
'
get
'
).
and
.
callFake
(
function
(
req
,
cb
)
{
spyOn
(
jQuery
,
'
get
'
).
and
.
callFake
(
function
(
req
,
cb
)
{
return
cb
(
window
.
emojiMenu
);
return
cb
(
window
.
emojiMenu
);
});
});
spyOn
(
Cookies
,
'
set
'
);
});
});
afterEach
(
function
()
{
afterEach
(
function
()
{
// restore original url root value
// restore original url root value
...
@@ -190,28 +189,6 @@
...
@@ -190,28 +189,6 @@
return
expect
(
$thumbsUpEmoji
.
data
(
"
original-title
"
)).
toBe
(
'
sam
'
);
return
expect
(
$thumbsUpEmoji
.
data
(
"
original-title
"
)).
toBe
(
'
sam
'
);
});
});
});
});
describe
(
'
::addEmojiToFrequentlyUsedList
'
,
function
()
{
it
(
'
should set a cookie with the correct default path
'
,
function
()
{
gon
.
relative_url_root
=
''
;
awardsHandler
.
addEmojiToFrequentlyUsedList
(
'
sunglasses
'
);
expect
(
Cookies
.
set
)
.
toHaveBeenCalledWith
(
'
frequently_used_emojis
'
,
'
sunglasses
'
,
{
path
:
'
/
'
,
expires
:
365
})
;
});
it
(
'
should set a cookie with the correct custom root path
'
,
function
()
{
gon
.
relative_url_root
=
'
/gitlab/subdir
'
;
awardsHandler
.
addEmojiToFrequentlyUsedList
(
'
alien
'
);
expect
(
Cookies
.
set
)
.
toHaveBeenCalledWith
(
'
frequently_used_emojis
'
,
'
alien
'
,
{
path
:
'
/gitlab/subdir
'
,
expires
:
365
})
;
});
});
describe
(
'
search
'
,
function
()
{
describe
(
'
search
'
,
function
()
{
return
it
(
'
should filter the emoji
'
,
function
()
{
return
it
(
'
should filter the emoji
'
,
function
()
{
$
(
'
.js-add-award
'
).
eq
(
0
).
click
();
$
(
'
.js-add-award
'
).
eq
(
0
).
click
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录