Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
8c33c526
Commit
8c33c526
authored
9 years ago
by
Thomas Müller
Browse files
Options
Downloads
Plain Diff
Merge pull request #19824 from owncloud/ie9-share-donotsendplaceholderaspassword
[IE9] Don't send link share password placeholder
parents
0875a4a1
0d98e5e4
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
core/js/sharedialoglinkshareview.js
+12
-7
12 additions, 7 deletions
core/js/sharedialoglinkshareview.js
with
12 additions
and
7 deletions
core/js/sharedialoglinkshareview.js
+
12
−
7
View file @
8c33c526
...
...
@@ -13,6 +13,9 @@
OC
.
Share
=
{};
}
var
PASSWORD_PLACEHOLDER
=
'
**********
'
;
var
PASSWORD_PLACEHOLDER_MESSAGE
=
t
(
'
core
'
,
'
Choose a password for the public link
'
);
var
TEMPLATE
=
'
{{#if shareAllowed}}
'
+
'
<span class="icon-loading-small hidden"></span>
'
+
...
...
@@ -133,11 +136,6 @@
this
.
model
.
saveLinkShare
();
}
else
{
this
.
$el
.
find
(
'
.linkPass
'
).
slideToggle
(
OC
.
menuSpeed
);
// TODO drop with IE8 drop
if
(
$
(
'
html
'
).
hasClass
(
'
ie8
'
))
{
this
.
$el
.
find
(
'
.linkPassText
'
).
attr
(
'
placeholder
'
,
null
);
this
.
$el
.
find
(
'
.linkPassText
'
).
val
(
''
);
}
this
.
$el
.
find
(
'
.linkPassText
'
).
focus
();
}
}
else
{
...
...
@@ -182,7 +180,8 @@
var
$input
=
this
.
$el
.
find
(
'
.linkPassText
'
);
$input
.
removeClass
(
'
error
'
);
var
password
=
$input
.
val
();
if
(
password
===
''
)
{
// in IE9 the password might be the placeholder due to bugs in the placeholders polyfill
if
(
password
===
''
||
password
===
PASSWORD_PLACEHOLDER
||
password
===
PASSWORD_PLACEHOLDER_MESSAGE
)
{
return
;
}
...
...
@@ -276,7 +275,7 @@
urlLabel
:
t
(
'
core
'
,
'
Link
'
),
enablePasswordLabel
:
t
(
'
core
'
,
'
Password protect
'
),
passwordLabel
:
t
(
'
core
'
,
'
Password
'
),
passwordPlaceholder
:
isPasswordSet
?
'
**********
'
:
t
(
'
core
'
,
'
Choose a password for the public link
'
)
,
passwordPlaceholder
:
isPasswordSet
?
PASSWORD_PLACEHOLDER
:
PASSWORD_PLACEHOLDER_MESSAGE
,
isPasswordSet
:
isPasswordSet
,
showPasswordCheckBox
:
showPasswordCheckBox
,
publicUpload
:
publicUpload
&&
isLinkShare
,
...
...
@@ -314,6 +313,12 @@
};
}
// TODO drop with IE8 drop
if
(
$
(
'
html
'
).
hasClass
(
'
ie8
'
))
{
this
.
$el
.
find
(
'
#linkPassText
'
).
removeAttr
(
'
placeholder
'
);
this
.
$el
.
find
(
'
#linkPassText
'
).
val
(
''
);
}
this
.
delegateEvents
();
return
this
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment