[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: T171843: Remove fields for category search and for prefix se...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370207 )
Change subject: T171843: Remove fields for category search and for prefix search
..
T171843: Remove fields for category search and for prefix search
Change-Id: I043fc44cc23a04e136153e391b70b4b851e28aa0
---
M modules/ext.advancedSearch.init.js
M package-lock.json
2 files changed, 1,035 insertions(+), 202 deletions(-)
Approvals:
Gabriel Birke: Looks good to me, approved
jenkins-bot: Verified
Jeroen De Dauw: Checked
diff --git a/modules/ext.advancedSearch.init.js
b/modules/ext.advancedSearch.init.js
index 8392d67..5b584eb 100644
--- a/modules/ext.advancedSearch.init.js
+++ b/modules/ext.advancedSearch.init.js
@@ -178,33 +178,12 @@
}
},
- // Structure
- {
- group: 'structure',
- id: 'subpage',
- placeholder: 'prefix:…',
- formatter: function ( val ) {
- return 'prefix:' + val;
- },
- greedy: true
- },
{
group: 'structure',
id: 'intitle',
placeholder: 'intitle:…',
formatter: function ( val ) {
return 'intitle:' + optionalQuotes( val );
- }
- },
- {
- group: 'structure',
- id: 'deepcat',
- placeholder: 'deepcat:…',
- /* enabled: function () {
-return !!mw.libs.deepCat;
-}, */
- formatter: function ( val ) {
- return 'deepcat:' + optionalQuotes( val );
}
},
@@ -237,27 +216,6 @@
return 'insource:' + ( /^\/.*\/$/.test( val ) ?
val : optionalQuotes( val ) );
}
},
-
- /*
- {
- group: 'categories',
- id: 'deepcat2',
- placeholder: 'deepcat:…',
- /* enabled: function () {
-return !!mw.libs.deepCat;
-},
- formatter: function ( val ) {
- return 'deepcat:' + optionalQuotes( val );
- }
- },
- {
- group: 'categories',
- id: 'incategory',
- placeholder: 'incategory:…',
- formatter: function ( val ) {
- return 'incategory:' + optionalQuotes( val );
- }
- }, */
// Files
// filebits:…
@@ -344,15 +302,6 @@
},
layout: createOptionalFieldLayout
}
- /* {
- group: 'files',
- id: 'fileres',
- placeholder: 'fileres:…',
- formatter: function ( val ) {
- return 'fileres:' + formatSizeConstraint( val );
- },
- requiredNamespace: 6
- } */
// Ordering
// prefer-recent:…
diff --git a/package-lock.json b/package-lock.json
index 1aed77c..6cc7486 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,4 +1,5 @@
{
+ "requires": true,
"lockfileVersion": 1,
"dependencies": {
"abbrev": {
@@ -18,6 +19,9 @@
"resolved":
"https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz;,
"integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
"dev": true,
+ "requires": {
+ "acorn": "3.3.0"
+ },
"dependencies": {
"acorn": {
"version": "3.3.0",
@@ -31,7 +35,11 @@
"version": "4.11.8",
"resolved":
"https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz;,
"integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
- "dev": true
+ "dev": true,
+ "requires": {
+ "co": "4.6.0",
+ "json-stable-stringify": "1.0.1"
+ }
},
"ajv-keywords": {
"version": "1.5.1",
@@ -67,13 +75,19 @@
[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: T171843: Remove fields for category search and for prefix se...
Jeroen De Dauw has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370207 )
Change subject: T171843: Remove fields for category search and for prefix search
..
T171843: Remove fields for category search and for prefix search
Change-Id: I043fc44cc23a04e136153e391b70b4b851e28aa0
---
M modules/ext.advancedSearch.init.js
M package-lock.json
2 files changed, 1,035 insertions(+), 202 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdvancedSearch
refs/changes/07/370207/1
diff --git a/modules/ext.advancedSearch.init.js
b/modules/ext.advancedSearch.init.js
index 8392d67..5b584eb 100644
--- a/modules/ext.advancedSearch.init.js
+++ b/modules/ext.advancedSearch.init.js
@@ -178,33 +178,12 @@
}
},
- // Structure
- {
- group: 'structure',
- id: 'subpage',
- placeholder: 'prefix:…',
- formatter: function ( val ) {
- return 'prefix:' + val;
- },
- greedy: true
- },
{
group: 'structure',
id: 'intitle',
placeholder: 'intitle:…',
formatter: function ( val ) {
return 'intitle:' + optionalQuotes( val );
- }
- },
- {
- group: 'structure',
- id: 'deepcat',
- placeholder: 'deepcat:…',
- /* enabled: function () {
-return !!mw.libs.deepCat;
-}, */
- formatter: function ( val ) {
- return 'deepcat:' + optionalQuotes( val );
}
},
@@ -237,27 +216,6 @@
return 'insource:' + ( /^\/.*\/$/.test( val ) ?
val : optionalQuotes( val ) );
}
},
-
- /*
- {
- group: 'categories',
- id: 'deepcat2',
- placeholder: 'deepcat:…',
- /* enabled: function () {
-return !!mw.libs.deepCat;
-},
- formatter: function ( val ) {
- return 'deepcat:' + optionalQuotes( val );
- }
- },
- {
- group: 'categories',
- id: 'incategory',
- placeholder: 'incategory:…',
- formatter: function ( val ) {
- return 'incategory:' + optionalQuotes( val );
- }
- }, */
// Files
// filebits:…
@@ -344,15 +302,6 @@
},
layout: createOptionalFieldLayout
}
- /* {
- group: 'files',
- id: 'fileres',
- placeholder: 'fileres:…',
- formatter: function ( val ) {
- return 'fileres:' + formatSizeConstraint( val );
- },
- requiredNamespace: 6
- } */
// Ordering
// prefer-recent:…
diff --git a/package-lock.json b/package-lock.json
index 1aed77c..6cc7486 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,4 +1,5 @@
{
+ "requires": true,
"lockfileVersion": 1,
"dependencies": {
"abbrev": {
@@ -18,6 +19,9 @@
"resolved":
"https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz;,
"integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
"dev": true,
+ "requires": {
+ "acorn": "3.3.0"
+ },
"dependencies": {
"acorn": {
"version": "3.3.0",
@@ -31,7 +35,11 @@
"version": "4.11.8",
"resolved":
"https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz;,
"integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
- "dev": true
+ "dev": true,
+ "requires": {
+ "co": "4.6.0",
+ "json-stable-stringify": "1.0.1"
+ }
},
"ajv-keywords": {
"version": "1.5.1",
@@ -67,13 +75,19 @@
