Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[2.1.x] Bumped minimum ESLint version to 4.18.2.

Browse Source 
Backport of ad7b438002f1ab2a0ccb321012182991737ea84e from master.
This commit is contained in:
Markus Holtermann 2019-06-21 17:57:36 +02:00 committed by Mariusz Felisiak
parent d58f8e4235
commit 20968e3eae
10 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js
View File

@ -21,7 +21,7 @@
dismissCalendarFunc: [], dismissCalendarFunc: [],
calendarDivName1: 'calendarbox', // name of calendar <div> that gets toggled calendarDivName1: 'calendarbox', // name of calendar <div> that gets toggled
calendarDivName2: 'calendarin', // name of <div> that contains calendar calendarDivName2: 'calendarin', // name of <div> that contains calendar
calendarLinkName: 'calendarlink',// name of the link that is used to toggle calendarLinkName: 'calendarlink', // name of the link that is used to toggle
clockDivName: 'clockbox', // name of clock <div> that gets toggled clockDivName: 'clockbox', // name of clock <div> that gets toggled
clockLinkName: 'clocklink', // name of the link that is used to toggle clockLinkName: 'clocklink', // name of the link that is used to toggle
shortCutsClass: 'datetimeshortcuts', // class of the clock and cal shortcuts shortCutsClass: 'datetimeshortcuts', // class of the clock and cal shortcuts

6
django/contrib/admin/static/admin/js/core.js
View File

@ -153,9 +153,9 @@ function findPosY(obj) {
return result; return result;
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// String object extensions // String object extensions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
String.prototype.pad_left = function(pad_length, pad_string) { String.prototype.pad_left = function(pad_length, pad_string) {
var new_string = this; var new_string = this;
for (var i = 0; new_string.length < pad_length; i++) { for (var i = 0; new_string.length < pad_length; i++) {

2
django/contrib/gis/static/gis/js/OLMapWidget.js
View File

@ -207,7 +207,7 @@ ol.inherits(GeometryTypeControl, ol.control.Control);
} else { } else {
geometry = features[0].getGeometry().clone(); geometry = features[0].getGeometry().clone();
for (var j = 1; j < features.length; j++) { for (var j = 1; j < features.length; j++) {
switch(geometry.getType()) { switch (geometry.getType()) {
case "MultiPoint": case "MultiPoint":
geometry.appendPoint(features[j].getGeometry().getPoint(0)); geometry.appendPoint(features[j].getGeometry().getPoint(0));
break; break;

2
package.json
View File

@ -9,7 +9,7 @@
"npm": ">=1.3.0 <3.0.0" "npm": ">=1.3.0 <3.0.0"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^0.22.1", "eslint": "^4.18.2",
"grunt": "^1.0.1", "grunt": "^1.0.1",
"grunt-cli": "^1.2.0", "grunt-cli": "^1.2.0",
"grunt-contrib-qunit": "^1.2.0" "grunt-contrib-qunit": "^1.2.0"