#25 Fix generated rdoc template issues.
Closed 3 years ago by vondruch. Opened 3 years ago by jaruga.
Unknown source hotfix/rdoc-typo  into  master

@@ -0,0 +1,34 @@

+ From d05e6269d4a4dfd701f5ddb3ae34306cba891511 Mon Sep 17 00:00:00 2001

+ From: Jun Aruga <jaruga@redhat.com>

+ Date: Fri, 3 Aug 2018 11:35:55 +0200

+ Subject: [PATCH] Fix indent and typo from moveTimout to moveTimeout.

+ 

+ ---

+  lib/rdoc/generator/template/json_index/js/navigation.js | 7 +++----

+  1 file changed, 3 insertions(+), 4 deletions(-)

+ 

+ diff --git a/lib/rdoc/generator/template/json_index/js/navigation.js b/lib/rdoc/generator/template/json_index/js/navigation.js

+ index e4126812..43c5118a 100644

+ --- a/lib/rdoc/generator/template/json_index/js/navigation.js

+ +++ b/lib/rdoc/generator/template/json_index/js/navigation.js

+ @@ -59,9 +59,8 @@ Navigation = new function() {

+          }

+          break;

+        case 13: //Event.KEY_RETURN:

+ -        if (this.$current)

+ -          e.preventDefault();

+ -          this.select(this.$current);

+ +        if (this.$current) e.preventDefault();

+ +        this.select(this.$current);

+          break;

+      }

+      if (e.ctrlKey && e.shiftKey) this.select(this.$current);

+ @@ -80,7 +79,7 @@ Navigation = new function() {

+      var go = function() {

+        if (!_this.moveTimeout) return;

+        _this[isDown ? 'moveDown' : 'moveUp']();

+ -      _this.moveTimout = setTimeout(go, 100);

+ +      _this.moveTimeout = setTimeout(go, 100);

+      }

+      this.moveTimeout = setTimeout(go, 200);

+    }

file modified
+6
@@ -152,6 +152,8 @@

  Patch18: ruby-2.6.0-fix-test-failure-with-TLS-1.3.patch

  # https://github.com/ruby/ruby/commit/1dfc377ae3b174b043d3f0ed36de57b0296b34d0

  Patch19: ruby-2.6.0-net-http-net-ftp-fix-session-resumption-with-TLS-1.3.patch

+ # https://github.com/ruby/rdoc/commit/d05e6269d4a4dfd701f5ddb3ae34306cba891511

+ Patch20: ruby-2.6.0-rdoc-6.0.1-fix-template-typo.patch

  

  Requires: %{name}-libs%{?_isa} = %{version}-%{release}

  Suggests: rubypick
@@ -540,6 +542,7 @@

  %patch17 -p1

  %patch18 -p1

  %patch19 -p1

+ %patch20 -p1

  

  # Provide an example of usage of the tapset:

  cp -a %{SOURCE3} .
@@ -1089,6 +1092,9 @@

  %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec

  

  %changelog

+ * Tue Aug 28 2018 Jun Aruga <jaruga@redhat.com> - 2.5.1-98

+ - Fix generated rdoc template issues.

+ 

  * Mon Aug 13 2018 Vít Ondruch <vondruch@redhat.com> - 2.5.1-98

  - Properly execute entire test suite.

  

This PR is to fix rdoc template issues, that are method name's typo and wrong indent.

Doing no change while keeping release, you should have created a completely new entry.

  • I wanted to say "Making changes while ...." of course

new entry?
without bumping version?

rebased onto 1bcbc1c016863c800cc0180a4206691b388b26ba

3 years ago

I rebased with bumping version and new entry.

rebased onto 4cfddab

3 years ago

I took your patch and deliberately updated it just a tiny bit because I had already additional work in my pipeline

https://src.fedoraproject.org/rpms/ruby/c/ec97a0708b71b52b2e47fa3732669b8e64cb90de?branch=master

Thx for the PR.

Pull-Request has been closed by vondruch

3 years ago