Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
core
Project
Project
Details
Activity
Releases
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
phani00
core
Commits
2e94e4cd
Commit
2e94e4cd
authored
Jan 15, 2019
by
Mario
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'core_fixes' into 'dev'
Core fixes See merge request
hubzilla/core!1470
parents
a8a5d2fc
c26e112b
Pipeline
#104025
passed with stage
in 13 minutes and 20 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
8 deletions
+12
-8
autocomplete.js
view/js/autocomplete.js
+0
-2
main.js
view/js/main.js
+11
-5
notifications_widget.tpl
view/tpl/notifications_widget.tpl
+1
-1
No files found.
view/js/autocomplete.js
View file @
2e94e4cd
...
...
@@ -216,8 +216,6 @@ function string2bb(element) {
});
textcomplete
.
register
([
contacts
,
forums
,
smilies
,
tags
]);
});
};
})(
jQuery
);
...
...
view/js/main.js
View file @
2e94e4cd
...
...
@@ -44,6 +44,17 @@ $(document).ready(function() {
$
(
document
).
on
(
'click'
,
'.conversation-settings-link'
,
getConversationSettings
);
$
(
document
).
on
(
'click'
,
'#settings_module_ajax_submit'
,
postConversationSettings
);
$
(
document
).
on
(
'click focus'
,
'.comment-edit-form textarea'
,
function
(
e
)
{
if
(
!
this
.
autocomplete_handled
)
{
/* autocomplete @nicknames */
$
(
this
).
editor_autocomplete
(
baseurl
+
"/acl?f=&n=1"
);
/* autocomplete bbcode */
$
(
this
).
bbco_autocomplete
(
'bbcode'
);
this
.
autocomplete_handled
=
true
;
}
});
var
tf
=
new
Function
(
'n'
,
's'
,
'var k = s.split("/")['
+
aStr
[
'plural_func'
]
+
']; return (k ? k : s);'
);
jQuery
.
timeago
.
settings
.
strings
=
{
...
...
@@ -755,11 +766,6 @@ function updateConvItems(mode,data) {
mediaPlaying
=
false
;
});
/* autocomplete @nicknames */
$
(
".comment-edit-form textarea"
).
editor_autocomplete
(
baseurl
+
"/acl?f=&n=1"
);
/* autocomplete bbcode */
$
(
".comment-edit-form textarea"
).
bbco_autocomplete
(
'bbcode'
);
var
bimgs
=
((
preloadImages
)
?
false
:
$
(
".wall-item-body img"
).
not
(
function
()
{
return
this
.
complete
;
}));
var
bimgcount
=
bimgs
.
length
;
...
...
view/tpl/notifications_widget.tpl
View file @
2e94e4cd
...
...
@@ -24,7 +24,7 @@
});
window
.
onpopstate
=
function
(
e
)
{
if
(
e
.
state
!==
null
)
if
(
e
.
state
!==
null
&&
e
.
state
.
b64mid
!==
bParam_mid
)
getData
(
e
.
state
.
b64mid
,
''
);
};
});
...
...
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