summaryrefslogtreecommitdiffstats
path: root/public/javascripts/application.js
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-01-19 07:42:26 +0000
committerGo MAEDA <maeda@farend.jp>2019-01-19 07:42:26 +0000
commit04ac58b3c52479e0deb937a9a7063df3fbd84b95 (patch)
tree1ed11eb6d99adae31876592ef6f5941ca7ddc304 /public/javascripts/application.js
parenta8d24ab4b8bc7e5a5df812790581420bdbf7b37a (diff)
downloadredmine-04ac58b3c52479e0deb937a9a7063df3fbd84b95.tar.gz
redmine-04ac58b3c52479e0deb937a9a7063df3fbd84b95.zip
New date filter operators: tomorrow, next week, next month (#4502).
Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@17811 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'public/javascripts/application.js')
-rw-r--r--public/javascripts/application.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 75848dd2c..cb4d42a99 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -289,11 +289,14 @@ function toggleOperator(field) {
switch (operator.val()) {
case "!*":
case "*":
+ case "nd":
case "t":
case "ld":
+ case "nw":
case "w":
case "lw":
case "l2w":
+ case "nm":
case "m":
case "lm":
case "y":
@@ -907,7 +910,7 @@ $(function ($) {
function setFilecontentContainerHeight() {
var $filecontainer = $('.filecontent-container');
var fileTypeSelectors = ['.image', 'video'];
-
+
if($filecontainer.length > 0 && $filecontainer.find(fileTypeSelectors.join(',')).length === 1) {
var containerOffsetTop = $filecontainer.offset().top;
var containerMarginBottom = parseInt($filecontainer.css('marginBottom'));