[devdocsgjs/main: 674/1867] Fix merge conflicts

From: Andy Holmes <andyholmes src gnome org>
To: commits-list gnome org
Cc:
Subject: [devdocsgjs/main: 674/1867] Fix merge conflicts
Date: Fri, 19 Nov 2021 23:47:23 +0000 (UTC)

commit 1c007d88267d70170313752b720d7444dfe39942
Merge: c6f0f169 e684e8cb
Author: Jasper van Merle <jaspervmerle gmail com>
Date:   Sat Jul 20 02:18:11 2019 +0200

    Fix merge conflicts

 .editorconfig                                      |   3 +
 .github/CONTRIBUTING.md                            |  19 +-
 .github/ISSUE_TEMPLATE.md                          |   2 +-
 .gitignore                                         |   7 +-
 .ruby-version                                      |   2 +-
 .travis.yml                                        |   8 +
 CODE_OF_CONDUCT.md                                 |   2 +
 COPYRIGHT                                          |   8 +-
 Dockerfile                                         |   3 +-
 Dockerfile-alpine                                  |   3 +-
 Gemfile                                            |   5 +-
 Gemfile.lock                                       |  91 +++++----
 PULL_REQUEST_TEMPLATE.md                           |  11 +
 README.md                                          |  65 ++++--
 assets/javascripts/app/app.coffee                  |  18 +-
 assets/javascripts/app/appcache.coffee             |  46 -----
 assets/javascripts/app/config.coffee.erb           |   2 +
 assets/javascripts/app/serviceworker.coffee        |  49 +++++
 assets/javascripts/app/settings.coffee             |  30 +++
 assets/javascripts/app/update_checker.coffee       |   6 +-
 assets/javascripts/lib/license.coffee              |   2 +-
 assets/javascripts/news.json                       |   4 +
 assets/javascripts/templates/error_tmpl.coffee     |  16 +-
 .../javascripts/templates/pages/about_tmpl.coffee  |  23 +--
 .../templates/pages/offline_tmpl.coffee            |  13 +-
 .../templates/pages/root_tmpl.coffee.erb           |   4 +-
 assets/javascripts/views/content/entry_page.coffee |   2 +-
 .../javascripts/views/content/settings_page.coffee |  12 +-
 assets/javascripts/views/layout/resizer.coffee     |  11 +-
 assets/javascripts/views/layout/settings.coffee    |  10 +-
 assets/javascripts/views/search/search.coffee      |   8 +
 .../javascripts/views/search/search_scope.coffee   |  11 +-
 assets/javascripts/views/sidebar/sidebar.coffee    |   2 +-
 assets/stylesheets/application.css.scss            |   2 +-
 assets/stylesheets/components/_fail.scss           |   2 -
 assets/stylesheets/components/_header.scss         |   1 +
 assets/stylesheets/pages/_mdn.scss                 |  25 +++
 assets/stylesheets/pages/_rdoc.scss                |  11 -
 docs/adding-docs.md                                |  23 +++
 docs/filter-reference.md                           | 224 +++++++++++++++++++++
 docs/maintainers.md                                | 102 ++++++++++
 docs/scraper-reference.md                          | 186 +++++++++++++++++
 lib/app.rb                                         |  57 ++++--
 lib/docs.rb                                        |  17 ++
 lib/docs/core/doc.rb                               |   6 +
 lib/docs/core/requester.rb                         |  12 +-
 lib/docs/core/scrapers/file_scraper.rb             |  25 ++-
 lib/docs/core/url.rb                               |   2 +-
 lib/docs/filters/cpp/entries.rb                    |   2 +
 lib/docs/filters/css/entries.rb                    |  27 ++-
 lib/docs/filters/dom/clean_html.rb                 |   2 +-
 lib/docs/filters/dom/entries.rb                    |  14 +-
 lib/docs/filters/html/entries.rb                   |   2 +-
 lib/docs/filters/javascript/clean_html.rb          |   4 +-
 lib/docs/filters/javascript/entries.rb             |   2 +-
 lib/docs/filters/mdn/clean_html.rb                 |  90 +++++++++
 lib/docs/filters/rdoc/clean_html.rb                |   6 +-
 lib/docs/filters/rust/clean_html.rb                |   6 +-
 lib/docs/filters/rust/entries.rb                   |  11 +-
 lib/docs/scrapers/c.rb                             |   1 -
 lib/docs/scrapers/cpp.rb                           |   1 -
 lib/docs/scrapers/dart.rb                          |   2 -
 lib/docs/scrapers/django.rb                        |   6 -
 lib/docs/scrapers/erlang.rb                        |   4 -
 lib/docs/scrapers/gnu/gcc.rb                       |   8 -
 lib/docs/scrapers/gnu/gnu_fortran.rb               |   4 -
 lib/docs/scrapers/nokogiri2.rb                     |  12 +-
 lib/docs/scrapers/numpy.rb                         |   1 -
 lib/docs/scrapers/openjdk.rb                       |   5 +-
 lib/docs/scrapers/perl.rb                          |   1 -
 lib/docs/scrapers/php.rb                           |   5 +-
 lib/docs/scrapers/python.rb                        |  12 +-
 lib/docs/scrapers/rdoc/minitest.rb                 |   9 +-
 lib/docs/scrapers/rdoc/rails.rb                    |  13 +-
 lib/docs/scrapers/rdoc/ruby.rb                     |  27 +--
 lib/docs/scrapers/rust.rb                          |   5 +-
 lib/docs/scrapers/sqlite.rb                        |   1 -
 lib/docs/subscribers/requester_subscriber.rb       |  13 ++
 lib/tasks/docs.thor                                |  87 ++++++--
 public/docs/docs.json                              |   1 -
 public/favicon.pxm                                 | Bin 0 -> 159961 bytes
 public/favicon 2x pxm                              | Bin 0 -> 190253 bytes
 public/icons/docs/css/CSS3.sketch/Data             | Bin 0 -> 69815 bytes
 .../docs/css/CSS3.sketch/QuickLook/Preview.png     | Bin 0 -> 19757 bytes
 .../docs/css/CSS3.sketch/QuickLook/Thumbnail.png   | Bin 0 -> 82586 bytes
 public/icons/docs/css/CSS3.sketch/fonts            |   0
 public/icons/docs/css/CSS3.sketch/version          |   1 +
 public/icons/docs/dom/DOM.sketch/Data              | Bin 0 -> 71791 bytes
 .../docs/dom/DOM.sketch/QuickLook/Preview.png      | Bin 0 -> 20363 bytes
 .../docs/dom/DOM.sketch/QuickLook/Thumbnail.png    | Bin 0 -> 95153 bytes
 public/icons/docs/dom/DOM.sketch/fonts             |   0
 public/icons/docs/dom/DOM.sketch/version           |   1 +
 .../icons/docs/dom_events/DOM_events.sketch/Data   | Bin 0 -> 96701 bytes
 .../DOM_events.sketch/QuickLook/Preview.png        | Bin 0 -> 19452 bytes
 .../DOM_events.sketch/QuickLook/Thumbnail.png      | Bin 0 -> 88324 bytes
 .../icons/docs/dom_events/DOM_events.sketch/fonts  |   0
 .../docs/dom_events/DOM_events.sketch/version      |   1 +
 public/icons/docs/express/16.pxm                   | Bin 0 -> 216121 bytes
 public/icons/docs/express/16 2x pxm                | Bin 0 -> 216822 bytes
 public/icons/docs/html/HTML5.sketch/Data           | Bin 0 -> 77064 bytes
 .../docs/html/HTML5.sketch/QuickLook/Preview.png   | Bin 0 -> 19675 bytes
 .../docs/html/HTML5.sketch/QuickLook/Thumbnail.png | Bin 0 -> 84121 bytes
 public/icons/docs/html/HTML5.sketch/fonts          |   0
 public/icons/docs/html/HTML5.sketch/version        |   1 +
 public/icons/docs/http/16.pxm                      | Bin 0 -> 105216 bytes
 public/icons/docs/http/16 2x pxm                   | Bin 0 -> 127095 bytes
 public/icons/docs/javascript/16.pxm                | Bin 0 -> 24870 bytes
 public/icons/docs/javascript/16 2x pxm             | Bin 0 -> 218914 bytes
 public/icons/docs/knockout/16 2x pxm               | Bin 0 -> 229176 bytes
 public/icons/docs/less/less.pxm                    | Bin 0 -> 85177 bytes
 public/icons/docs/moment/moment.sketch/Data        | Bin 0 -> 13875 bytes
 .../moment/moment.sketch/QuickLook/Preview.png     | Bin 0 -> 378 bytes
 .../moment/moment.sketch/QuickLook/Thumbnail.png   | Bin 0 -> 49727 bytes
 public/icons/docs/moment/moment.sketch/fonts       |   0
 public/icons/docs/moment/moment.sketch/metadata    |  14 ++
 public/icons/docs/moment/moment.sketch/version     |   1 +
 public/icons/docs/nokogiri/icon.pxm                | Bin 0 -> 103911 bytes
 public/icons/docs/php/16 2x pxm                    | Bin 0 -> 172499 bytes
 public/icons/docs/rails/rails.pxm                  | Bin 0 -> 333016 bytes
 public/icons/docs/sass/sass.pxm                    | Bin 0 -> 111000 bytes
 public/icons/docs/support_tables/16.pxm            | Bin 0 -> 101020 bytes
 public/icons/docs/support_tables/16 2x pxm         | Bin 0 -> 118881 bytes
 public/icons/docs/xpath/XPath.sketch/Data          | Bin 0 -> 22373 bytes
 .../docs/xpath/XPath.sketch/QuickLook/Preview.png  | Bin 0 -> 26202 bytes
 .../xpath/XPath.sketch/QuickLook/Thumbnail.png     | Bin 0 -> 109471 bytes
 public/icons/docs/xpath/XPath.sketch/metadata      |  18 ++
 public/icons/docs/xpath/XPath.sketch/version       |   1 +
 public/images/apple-icon.pxm                       | Bin 0 -> 396318 bytes
 public/images/fluid-icon.pxm                       | Bin 0 -> 522097 bytes
 public/images/icon.pxm                             | Bin 0 -> 214911 bytes
 public/images/webapp-icon-192.png                  | Bin 0 -> 32187 bytes
 public/images/webapp-icon-small.pxm                | Bin 0 -> 143934 bytes
 public/manifest.json                               |   6 +
 test/app_test.rb                                   |  86 +-------
 test/lib/docs/core/scrapers/file_scraper_test.rb   | 136 ++++++++-----
 views/app.erb                                      |  14 +-
 views/index.erb                                    |   5 +-
 views/manifest.erb                                 |  14 --
 views/other.erb                                    |   5 +-
 views/service-worker.js.erb                        |  49 +++++
 views/unsupported.erb                              |  12 +-
 141 files changed, 1406 insertions(+), 536 deletions(-)
---
diff --cc assets/javascripts/views/search/search_scope.coffee
index 8b104011,4a43f641..52ff753a
--- a/assets/javascripts/views/search/search_scope.coffee
+++ b/assets/javascripts/views/search/search_scope.coffee
@@@ -6,8 -6,8 +6,9 @@@ class app.views.SearchScope extends app
      tag:   '._search-tag'
  
    @events:
+     click: 'onClick'
      keydown: 'onKeydown'
 +    textInput: 'onTextInput'
  
    @routes:
      after: 'afterRoute'
@@@ -88,17 -88,18 +89,23 @@@
      @trigger 'change', null, previousDoc
      return
  
 +  doScopeSearch: (event) =>
 +    @search @input.value[0...@input.selectionStart]
 +    $.stopEvent(event) if @doc
 +    return
 +
+   onClick: (event) =>
+     if event.target is @tag
+       @reset()
+       $.stopEvent(event)
+     return
+ 
    onKeydown: (event) =>
      if event.which is 8 # backspace
-       if @doc and not @input.value
-         $.stopEvent(event)
+       if @doc and @input.selectionEnd is 0
          @reset()
+         $.stopEvent(event)
 -    else if not @doc and @input.value
 +    else if not @doc and @input.value and not $.isChromeForAndroid()
        return if event.ctrlKey or event.metaKey or event.altKey or event.shiftKey
        if event.which is 9 or # tab
           (event.which is 32 and app.isMobile()) # space
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]