harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #819 from pafcu/acl

Browse Source 
Fix initEditor on non-wall pages
This commit is contained in:
pafcu 2015-01-05 01:31:52 +02:00
commit fc72762f52
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
view/js/autocomplete.js
View File

@ -43,7 +43,8 @@ function replace(item) {
* jQuery plugin 'contact_autocomplete' * jQuery plugin 'contact_autocomplete'
*/ */
(function( $ ){ (function( $ ){
$.fn.contact_autocomplete = function(backend_url, extra_channels = null) { $.fn.contact_autocomplete = function(backend_url, extra_channels) {
if (typeof extra_channels === 'undefined') extra_channels = false;
// Autocomplete contacts // Autocomplete contacts
contacts = { contacts = {

5
view/tpl/jot-header.tpl
View File

@ -10,7 +10,10 @@ function initEditor(cb){
if(plaintext == 'none') { if(plaintext == 'none') {
$("#profile-jot-text-loading").spin(false).hide(); $("#profile-jot-text-loading").spin(false).hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections if(typeof channelId === 'undefined')
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
else
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections
editor = true; editor = true;
$("a#jot-perms-icon").colorbox({ $("a#jot-perms-icon").colorbox({
'inline' : true, 'inline' : true,