7d252ea45b
* Refactor `TouchHandler` to handle double-tap and swipe gestures.
* Renamed existing `onTouch` JavaScript methods to `onItemTouch` and
added `onContentTouch` methods for swipe gesture.
* Refactor double-tap. It's now a method in `TouchHandler` versus
anonymous functions in `listen()` method.
* Updated CSS classes.
* Added `touch-action` CSS for `.entry-content`.
* Renamed CSS classes for adding events in `TouchHandler`.
* Updated users settings to replace checkbox for double tap with select
for none, double tap, or swipe.
* Added database migrations for new gesture_nav option.
* Rename `users.double_tap` to `users.gesture_nav` and migrate
existing user settings.
* Updated translation files. (Non-English updated with Google
Translate.)
Resolves #1449, closes #1495
124 lines
4 KiB
Go
124 lines
4 KiB
Go
// Copyright 2017 Frédéric Guillot. All rights reserved.
|
|
// Use of this source code is governed by the Apache 2.0
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package form // import "miniflux.app/ui/form"
|
|
|
|
import (
|
|
"net/http"
|
|
"strconv"
|
|
|
|
"miniflux.app/errors"
|
|
"miniflux.app/model"
|
|
)
|
|
|
|
// SettingsForm represents the settings form.
|
|
type SettingsForm struct {
|
|
Username string
|
|
Password string
|
|
Confirmation string
|
|
Theme string
|
|
Language string
|
|
Timezone string
|
|
EntryDirection string
|
|
EntryOrder string
|
|
EntriesPerPage int
|
|
KeyboardShortcuts bool
|
|
ShowReadingTime bool
|
|
CustomCSS string
|
|
EntrySwipe bool
|
|
GestureNav string
|
|
DisplayMode string
|
|
DefaultReadingSpeed int
|
|
CJKReadingSpeed int
|
|
DefaultHomePage string
|
|
CategoriesSortingOrder string
|
|
}
|
|
|
|
// Merge updates the fields of the given user.
|
|
func (s *SettingsForm) Merge(user *model.User) *model.User {
|
|
user.Username = s.Username
|
|
user.Theme = s.Theme
|
|
user.Language = s.Language
|
|
user.Timezone = s.Timezone
|
|
user.EntryDirection = s.EntryDirection
|
|
user.EntryOrder = s.EntryOrder
|
|
user.EntriesPerPage = s.EntriesPerPage
|
|
user.KeyboardShortcuts = s.KeyboardShortcuts
|
|
user.ShowReadingTime = s.ShowReadingTime
|
|
user.Stylesheet = s.CustomCSS
|
|
user.EntrySwipe = s.EntrySwipe
|
|
user.GestureNav = s.GestureNav
|
|
user.DisplayMode = s.DisplayMode
|
|
user.CJKReadingSpeed = s.CJKReadingSpeed
|
|
user.DefaultReadingSpeed = s.DefaultReadingSpeed
|
|
user.DefaultHomePage = s.DefaultHomePage
|
|
user.CategoriesSortingOrder = s.CategoriesSortingOrder
|
|
|
|
if s.Password != "" {
|
|
user.Password = s.Password
|
|
}
|
|
|
|
return user
|
|
}
|
|
|
|
// Validate makes sure the form values are valid.
|
|
func (s *SettingsForm) Validate() error {
|
|
if s.Username == "" || s.Theme == "" || s.Language == "" || s.Timezone == "" || s.EntryDirection == "" || s.DisplayMode == "" || s.DefaultHomePage == "" {
|
|
return errors.NewLocalizedError("error.settings_mandatory_fields")
|
|
}
|
|
|
|
if s.CJKReadingSpeed <= 0 || s.DefaultReadingSpeed <= 0 {
|
|
return errors.NewLocalizedError("error.settings_reading_speed_is_positive")
|
|
}
|
|
|
|
if s.Confirmation == "" {
|
|
// Firefox insists on auto-completing the password field.
|
|
// If the confirmation field is blank, the user probably
|
|
// didn't intend to change their password.
|
|
s.Password = ""
|
|
} else if s.Password != "" {
|
|
if s.Password != s.Confirmation {
|
|
return errors.NewLocalizedError("error.different_passwords")
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// NewSettingsForm returns a new SettingsForm.
|
|
func NewSettingsForm(r *http.Request) *SettingsForm {
|
|
entriesPerPage, err := strconv.ParseInt(r.FormValue("entries_per_page"), 10, 0)
|
|
if err != nil {
|
|
entriesPerPage = 0
|
|
}
|
|
defaultReadingSpeed, err := strconv.ParseInt(r.FormValue("default_reading_speed"), 10, 0)
|
|
if err != nil {
|
|
defaultReadingSpeed = 0
|
|
}
|
|
cjkReadingSpeed, err := strconv.ParseInt(r.FormValue("cjk_reading_speed"), 10, 0)
|
|
if err != nil {
|
|
cjkReadingSpeed = 0
|
|
}
|
|
return &SettingsForm{
|
|
Username: r.FormValue("username"),
|
|
Password: r.FormValue("password"),
|
|
Confirmation: r.FormValue("confirmation"),
|
|
Theme: r.FormValue("theme"),
|
|
Language: r.FormValue("language"),
|
|
Timezone: r.FormValue("timezone"),
|
|
EntryDirection: r.FormValue("entry_direction"),
|
|
EntryOrder: r.FormValue("entry_order"),
|
|
EntriesPerPage: int(entriesPerPage),
|
|
KeyboardShortcuts: r.FormValue("keyboard_shortcuts") == "1",
|
|
ShowReadingTime: r.FormValue("show_reading_time") == "1",
|
|
CustomCSS: r.FormValue("custom_css"),
|
|
EntrySwipe: r.FormValue("entry_swipe") == "1",
|
|
GestureNav: r.FormValue("gesture_nav"),
|
|
DisplayMode: r.FormValue("display_mode"),
|
|
DefaultReadingSpeed: int(defaultReadingSpeed),
|
|
CJKReadingSpeed: int(cjkReadingSpeed),
|
|
DefaultHomePage: r.FormValue("default_home_page"),
|
|
CategoriesSortingOrder: r.FormValue("categories_sorting_order"),
|
|
}
|
|
}
|