MediaWiki:Gadget-Merge.js - Revision history

Podehaye at 22:07, 20 January 2020

2020-01-20T22:07:21Z

Podehaye at 22:06, 20 January 2020

2020-01-20T22:06:21Z

Podehaye at 22:00, 20 January 2020

2020-01-20T22:00:40Z

Podehaye at 21:57, 20 January 2020

2020-01-20T21:57:09Z

Podehaye at 21:55, 20 January 2020

2020-01-20T21:55:32Z

Podehaye at 19:22, 16 October 2019

2019-10-16T19:22:02Z

Podehaye at 18:58, 16 October 2019

2019-10-16T18:58:16Z

Podehaye at 13:00, 16 October 2019

2019-10-16T13:00:32Z

Podehaye at 12:52, 16 October 2019

2019-10-16T12:52:15Z

Podehaye at 12:49, 16 October 2019

2019-10-16T12:49:50Z

@@ Line 797: / Line 797: @@
+       }
      }, function (code, result) {
-       self.emit('error', result.error.extradata[0] || result.error.info);
+       self.emit('error', result.error.info || result.error.extradata[0] );
      });
    };

@@ Line 6: / Line 6: @@
   */
 // See also: MediaWiki:Gadget-EmptyDetect.js and MediaWiki:Gadget-RfDHelper.js
 (function ($, mw, OO) {
    'use strict';
    var messages, entityId = mw.config.get('wbEntityId'), api = new mw.Api();
    messages = (function () {
      var translations = {
@@ Line 668: / Line 666: @@
      mw.storage.remove('merge-pending-id');
+   }
    /**
@@ Line 710: / Line 707: @@
      });
+   }
    /**
@@ Line 804: / Line 800: @@
      });
    };
    /**
@@ Line 861: / Line 856: @@
+   }
    OO.inheritClass(MergeDialog, OO.ui.ProcessDialog);
-−
    MergeDialog.static.name = 'mergeDialog';
    MergeDialog.static.title = messages.mergeWizard;
@@ Line 884: / Line 879: @@
+     }
    ];
-−
    /**
     * @inheritdoc
@@ Line 943: / Line 938: @@
      ]);
      this.mergeUnwatch = new OO.ui.CheckboxInputWidget({
-       selected: mw.storage.get('merge-unwatch') === true
+       selected: mw.storage.get('merge-unwatch') === 'true'
      });
      fieldset.addItems([
@@ Line 955: / Line 950: @@
      ]);
      this.loadMergeDestination = new OO.ui.CheckboxInputWidget({
-       selected: mw.storage.get('merge-load-destination') !== false
+       selected: mw.storage.get('merge-load-destination') !== 'false'
      });
      fieldset.addItems([
@@ Line 995: / Line 990: @@
     */
    MergeDialog.prototype.saveOptions = function () {
-     mw.storage.set('merge-always-lowest-id', this.mergeAlwaysLowestId.isSelected());
+     mw.storage.set('merge-always-lowest-id', this.mergeAlwaysLowestId.isSelected().toString());
-     mw.storage.set('merge-unwatch', this.mergeUnwatch.isSelected());
+     mw.storage.set('merge-unwatch', this.mergeUnwatch.isSelected().toString());
-     mw.storage.set('merge-create-redirect', this.mergeCreateRedirect.isSelected());
+     mw.storage.set('merge-create-redirect', this.mergeCreateRedirect.isSelected().toString());
-     mw.storage.set('merge-load-destination', this.loadMergeDestination.isSelected());
+     mw.storage.set('merge-load-destination', this.loadMergeDestination.isSelected().toString());
    };
@@ Line 1,114: / Line 1,109: @@
      windowManager.openWindow(dialog);
+   }
-−
    // Initialization
    if (entityId !== null &&
@@ Line 1,169: / Line 1,164: @@
      launchDialog: launchDialog
    };
 }(jQuery, mediaWiki, OO));

@@ Line 801: / Line 801: @@
+       }
      }, function (code, result) {
-      console.log("error!!!", result)
+       self.emit('error', result.error.extradata[0] || result.error.info);
      });
    };

@@ Line 802: / Line 802: @@
      }, function (code, result) {
        console.log("error!!!", result)
-       self.emit('error', result.error.extradata[0] || result.error.info);
+       self.emit('error', result.error.info);
      });
    };

@@ Line 801: / Line 801: @@
+       }
      }, function (code, result) {
        self.emit('error', result.error.extradata[0] || result.error.info);
      });

@@ Line 12: / Line 12: @@
    'use strict';
-   var messages;
+   var messages, entityId = mw.config.get('wbEntityId'), api = new mw.Api();
    messages = (function () {
      var translations = {
@@ Line 863: / Line 860: @@
      this.entityId = config.entityId;
+   }
    OO.inheritClass(MergeDialog, OO.ui.ProcessDialog);
-   console.log("called OO.inheritClass")
    MergeDialog.static.name = 'mergeDialog';
    MergeDialog.static.title = messages.mergeWizard;
@@ Line 889: / Line 884: @@
+     }
    ];
    /**
@@ Line 1,121: / Line 1,115: @@
+   }
    // Initialization
    if (entityId !== null &&
        [120, 146].indexOf(mw.config.get('wgNamespaceNumber')) !== -1 &&
        mw.config.get('wgAction') === 'view') {
      $(window).on('focus storage', function () {
        $('#ca-merge-queue-process').remove();

@@ Line 15: / Line 15: @@
    var entityId = mw.config.get( 'wbEntityId' );
    var api = new mw.Api();
-   mw.notify("Got API "+ entityId);
+   console.log("Got API "+ entityId);
    messages = (function () {
      var translations = {
@@ Line 863: / Line 863: @@
      this.entityId = config.entityId;
+   }
-   mw.notify("about to call OO.inheritClass")
+   console.log("about to call OO.inheritClass")
    OO.inheritClass(MergeDialog, OO.ui.ProcessDialog);
-   mw.notify("called OO.inheritClass")
+   console.log("called OO.inheritClass")
    MergeDialog.static.name = 'mergeDialog';