Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make title, description and location autoresizing textareas #227

Merged
merged 1 commit into from
Dec 12, 2016
Merged

make title, description and location autoresizing textareas #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions css/app/eventdialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@
width: 60px;
}

.events--textarea,
.advanced--textarea {
resize: none;
}

.advanced .events--time {
width: 100%;
}
Expand Down Expand Up @@ -164,11 +169,6 @@
width: 100%;
}

.advanced .advanced--fieldset textarea {
height: 4.5em;
resize: vertical;
}

.advanced .tabHeaders {
margin: 0 0 15px;
float: left;
Expand Down
3 changes: 2 additions & 1 deletion js/.jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"escapeHTML": true,
"possible": true,
"dav": true,
"hslToRgb": true
"hslToRgb": true,
"autosize": true
}
}
12 changes: 10 additions & 2 deletions js/app/controllers/editorcontroller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
* Description: Takes care of anything inside the Events Modal.
*/

app.controller('EditorController', ['$scope', 'TimezoneService', 'AutoCompletionService', '$window', '$uibModalInstance', 'vevent', 'simpleEvent', 'calendar', 'isNew', 'emailAddress',
function($scope, TimezoneService, AutoCompletionService, $window, $uibModalInstance, vevent, simpleEvent, calendar, isNew, emailAddress) {
app.controller('EditorController', ['$scope', 'TimezoneService', 'AutoCompletionService', '$timeout', '$window', '$uibModalInstance', 'vevent', 'simpleEvent', 'calendar', 'isNew', 'emailAddress',
function($scope, TimezoneService, AutoCompletionService, $timeout, $window, $uibModalInstance, vevent, simpleEvent, calendar, isNew, emailAddress) {
'use strict';

$scope.properties = simpleEvent;
Expand Down Expand Up @@ -77,6 +77,14 @@ app.controller('EditorController', ['$scope', 'TimezoneService', 'AutoCompletion
$scope.properties.dtend.value = moment($scope.properties.dtend.value.subtract(1, 'days'));
}

autosize($('.advanced--textarea'));
autosize($('.events--textarea'));

$timeout(() => {
autosize.update($('.advanced--textarea'));
autosize.update($('.events--textarea'));
}, 50);

angular.forEach($scope.preEditingHooks, function(callback) {
callback();
});
Expand Down
7 changes: 4 additions & 3 deletions templates/editor.popover.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<div>
<form class="events" ng-submit="save()">
<fieldset class="events--fieldset" ng-disabled="readOnly">
<input
class="events--input h2"
<textarea
rows="1"
class="events--input h2 events--textarea"
ng-model="properties.summary.value"
placeholder="<?php p($l->t('Title of the Event'));?>"
name="title" type="text"
autofocus="autofocus"
/>
></textarea>
<select
ng-model="calendar"
ng-change="selectedCalendarChanged()"
Expand Down
11 changes: 6 additions & 5 deletions templates/editor.sidebar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
<div class="sidebar-top">
<div class="advanced--container">
<fieldset class="advanced--fieldset" ng-disabled="readOnly">
<input
class="advanced--input h2"
<textarea
class="advanced--input h2 advanced--textarea"
ng-model="properties.summary.value"
placeholder="<?php p($l->t('Title of the Event'));?>"
name="title" type="text"
autofocus="autofocus"/>
rows="1"
autofocus="autofocus"></textarea>
<select
ng-model="calendar"
ng-change="selectedCalendarChanged()"
Expand Down Expand Up @@ -56,12 +57,12 @@ class="checkbox"
</fieldset>

<fieldset ng-show="eventsdetailsview" class="advanced--fieldset" ng-disabled="readOnly">
<textarea ng-model="properties.location.value" type="text" class="advanced--input"
<textarea ng-model="properties.location.value" type="text" class="advanced--input advanced--textarea" rows="1"
placeholder="<?php p($l->t('Location'));?>" name="location"
uib-typeahead="location.name for location in searchLocation($viewValue)" typeahead-show-hint="true" typeahead-min-length="3"
typeahead-on-select="selectLocationFromTypeahead($item)"
autocomplete="off" ></textarea>
<textarea ng-model="properties.description.value" type="text" class="advanced--input advanced--textarea"
<textarea ng-model="properties.description.value" type="text" class="advanced--input advanced--textarea" rows="1"
placeholder="<?php p($l->t('Description'));?>" name="description"></textarea>
<select id="statusSelector"
ng-options="status.type as status.displayname for status in statusSelect"
Expand Down