mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity

Better SpacePicker URL Handling

Browse Source
This commit is contained in:
Lucas Bartholemy 2014-02-23 19:29:06 +01:00
parent c101b6a28c
commit e82ebb07cd
3 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
protected/modules_core/space/resources/spacepicker.js
View File

@ -6,7 +6,6 @@
* @property String $inputId is the ID of the input HTML Element
* @property Int $maxSpaces the maximum of users in this dropdown
* @property String $spaceSearchUrl the url of the search, to find the spaces
* @property String $jsonTermKey the parameter of the search
* @property String $currentValue is the current value of the parent field.
* @property String $templates.inputStructure is the HTML structure to replace the original input element.
*
@ -17,14 +16,13 @@
var chosen = "";
var spaceCount = 0;
$.fn.spacepicker = function (options) {
$.fn.spacepicker = function(options) {
// set standard options
options = $.extend({
inputId: "",
maxSpaces: 0,
searchUrl: "",
searchKey: "keyword",
currentValue: "",
templates: {
inputStructure: '<div class="space_picker_container"><ul class="tag_input" id="space_tags"><li id="space_tag_input"><input type="text" id="space_input_field" class="tag_input_field" value="" autocomplete="off" placeholder="Add a space"></li></ul><ul class="dropdown-menu" id="spacepicker" role="menu" aria-labelledby="dropdownMenu"></ul></div>'
@ -70,9 +68,9 @@ $.fn.spacepicker = function (options) {
$('#space_tags').prepend(html);
// create function for every space tag to remove the element
$('#space_tags .spaceInput i').each(function () {
$('#space_tags .spaceInput i').each(function() {
$(this).click(function () {
$(this).click(function() {
// remove user tag
$(this).parent().remove();
@ -92,20 +90,20 @@ $.fn.spacepicker = function (options) {
// Set focus on the input field, by clicking the <ul> construct
jQuery('#space_tags').click(function () {
jQuery('#space_tags').click(function() {
// set focus
$('#space_input_field').focus();
})
$('#space_input_field').keydown(function (event) {
$('#space_input_field').keydown(function(event) {
// by pressing the tab key an the input is empty
if ($(this).val() == "" && event.keyCode == 9) {
//do nothing
// by pressing enter, tab, up or down arrow
// by pressing enter, tab, up or down arrow
} else if (event.keyCode == 40 || event.keyCode == 38 || event.keyCode == 13 || event.keyCode == 9) {
// ... disable the default behavior to hold the cursor at the end of the string
@ -129,7 +127,7 @@ $.fn.spacepicker = function (options) {
})
$('#space_input_field').keyup(function (event) {
$('#space_input_field').keyup(function(event) {
// start search after a specific count of characters
if ($('#space_input_field').val().length >= 3) {
@ -191,7 +189,7 @@ $.fn.spacepicker = function (options) {
})
$('#space_input_field').focusout(function () {
$('#space_input_field').focusout(function() {
// set the plain text including user guids to the original input or textarea element
$(options.inputId).val(parseSpaceInput());
@ -206,7 +204,7 @@ $.fn.spacepicker = function (options) {
// show loader while loading
$('#spacepicker').html('<li><div class="loader"></div></li>');
jQuery.getJSON(options.searchUrl + "?" + options.searchKey + "=" + string, function (json) {
jQuery.getJSON(options.searchUrl.replace('-keywordPlaceholder-', string), function(json) {
// remove existings entries
$('#spacepicker li').remove();
@ -265,7 +263,7 @@ $.fn.spacepicker = function (options) {
}
// Add a space tag for invitation
function addSpaceTag(guid,image_url, name) {
function addSpaceTag(guid, image_url, name) {
// Building a new <li> entry
@ -277,7 +275,7 @@ function addSpaceTag(guid,image_url, name) {
// remove tag, by clicking the close icon
$('#' + guid + " i").click(function () {
$('#' + guid + " i").click(function() {
// remove space tag
$('#' + guid).remove();
@ -311,7 +309,7 @@ function parseSpaceInput() {
$('#spaceInputResult').html($('#space_tags').html());
$('#spaceInputResult .spaceInput').each(function () {
$('#spaceInputResult .spaceInput').each(function() {
// add the space guid as plain text
$(this).after(this.id + ",");

25
protected/modules_core/space/widgets/SpacePickerWidget.php
View File

@ -26,8 +26,7 @@
* @since 0.5
* @author Luke
*/
class SpacePickerWidget extends HWidget
{
class SpacePickerWidget extends HWidget {
/**
* Id of input element which should replaced
@ -38,18 +37,13 @@ class SpacePickerWidget extends HWidget
/**
* JSON Search URL - default: browse/searchJson
*
* @var type
*
* The token -keywordPlaceholder- will replaced by the current search query.
*
* @var String Url with -keywordPlaceholder-
*/
public $spaceSearchUrl = "";
/**
* jsonTermKey is the parameter for the user search
*
* @var type
*/
public $jsonTermKey = "keyword";
/**
* Maximum spaces
*
@ -72,10 +66,9 @@ class SpacePickerWidget extends HWidget
* Inits the User Picker
*
*/
public function init()
{
public function init() {
if ($this->spaceSearchUrl == "")
$this->spaceSearchUrl = Yii::app()->getController()->createUrl('//space/browse/searchJson');
$this->spaceSearchUrl = Yii::app()->getController()->createUrl('//space/browse/searchJson', array('keyword' => '-keywordPlaceholder-'));
$assetPrefix = Yii::app()->assetManager->publish(dirname(__FILE__) . '/../resources', true, 0, defined('YII_DEBUG'));
Yii::app()->clientScript->registerScriptFile($assetPrefix . '/spacepicker.js');
@ -84,8 +77,7 @@ class SpacePickerWidget extends HWidget
/**
* Displays / Run the Widgets
*/
public function run()
{
public function run() {
// Try to get current field value, when model & attribute attributes are specified.
$currentValue = "";
@ -99,7 +91,6 @@ class SpacePickerWidget extends HWidget
'maxSpaces' => $this->maxSpaces,
'currentValue' => $currentValue,
'inputId' => $this->inputId,
'jsonTermKey' => $this->jsonTermKey,
));
}

2
protected/modules_core/space/widgets/views/spacePicker.php
View File

@ -5,7 +5,6 @@
* @property String $inputId is the ID of the input HTML Element
* @property Int $maxSpaces the maximum of spaces for this input
* @property String $spaceSearchUrl the url of the search, to find the spaces
* @property String $jsonTermKey the parameter of the search
* @property String $currentValue is the current value of the parent field.
*
* @package humhub.modules_core.user
@ -35,7 +34,6 @@ foreach (explode(",", $currentValue) as $guid) {
inputId: '#<?php echo $inputId; ?>',
maxSpaces: '<?php echo $maxSpaces; ?>',
searchUrl: '<?php echo $spaceSearchUrl; ?>',
searchKey: '<?php echo $jsonTermKey; ?>',
currentValue: '<?php echo $newValue; ?>'
});