Inchikutty has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141121
Change subject: Merge branch 'master' of
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard into
review/inchikutty/bug/56612
......................................................................
Merge branch 'master' of
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard into
review/inchikutty/bug/56612
Change-Id: Ic078518d1ea74aef6a5d7a266617a542c5890a94
---
M resources/mw.UploadWizardDetails.js
1 file changed, 0 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/21/141121/1
diff --git a/resources/mw.UploadWizardDetails.js
b/resources/mw.UploadWizardDetails.js
index 59a5319..e925921 100644
--- a/resources/mw.UploadWizardDetails.js
+++ b/resources/mw.UploadWizardDetails.js
@@ -197,9 +197,6 @@
// .append( $( '<div class="mwe-location-alt-label"></div>'
).append( mw.message( 'mwe-upwiz-location-alt' ).text() ) )
// .append( _this.altInput );
-<<<<<<< HEAD (ed228b UploadWizard: OSM embedding: Geocoding, reverse
geocoding)
- var locationDiv = $( '<div class="mwe-location
mwe-upwiz-details-fieldname-input ui-helper-clearfix"></div>' )
-=======
showMap = $( '<a></a>' )
.append( mw.message( 'mwe-upwiz-location-button' ).text() )
.hide();
@@ -208,7 +205,6 @@
.append( showMap );
locationDiv = $( '<div class="mwe-location
mwe-upwiz-details-fieldname-input ui-helper-clearfix"></div>' )
->>>>>>> BRANCH (83a10f Localisation updates from https://translatewiki.net.)
.append( $ ('<div class="mwe-location-label"></div>' )
.append( mw.message( 'mwe-upwiz-location' ).escaped() )
.addHint( 'location' ) )
@@ -332,9 +328,6 @@
}
} );
-<<<<<<< HEAD (ed228b UploadWizard: OSM embedding: Geocoding, reverse
geocoding)
- _this.map = new mw.GeoMap( _this.$form );
-=======
$list = this.$form.find( '.mwe-loc-lat, .mwe-loc-lon ' )
.on( 'input keyup change cut paste', function () {
var link = details.osmMapLink();
@@ -345,7 +338,6 @@
showMap.hide();
}
} );
->>>>>>> BRANCH (83a10f Localisation updates from https://translatewiki.net.)
$.each( this.fields, function ( i, $fieldInput ) {
$fieldInput.rules( 'add', {
@@ -790,22 +782,8 @@
'mwe-upwiz-copy-metadata'
);
-<<<<<<< HEAD (ed228b UploadWizard: OSM embedding: Geocoding, reverse
geocoding)
- _this.$form.append( _this.copyMetadataCtrlDiv, copyMetadataDiv
);
- _this.copyMetadataCtrlDiv.show();
-=======
this.$form.append( this.copyMetadataCtrlDiv, $copyMetadataDiv );
this.copyMetadataCtrlDiv.show();
- },
-
- /**
- * Open OSM map
- */
- osmMapLink: function () {
- var mapLink = new mw.Uri( 'https://openstreetmap.org/' )
- .extend( { zoom: 9, layers: 'M', lat:
this.$latInput.val(), lon: this.$lonInput.val() } );
- return mapLink.toString();
->>>>>>> BRANCH (83a10f Localisation updates from https://translatewiki.net.)
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/141121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic078518d1ea74aef6a5d7a266617a542c5890a94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: osm
Gerrit-Owner: Inchikutty <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
