Unverified Commit 993dd9a8 authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge branch 'dev' into patch-1

parents ff6acd35 d7d6e8cf
Loading
Loading
Loading
Loading

.eslintignore

0 → 100644
+4 −0
Original line number Original line Diff line number Diff line
extensions
extensions-disabled
repositories
venv
 No newline at end of file

.eslintrc.js

0 → 100644
+91 −0
Original line number Original line Diff line number Diff line
/* global module */
module.exports = {
    env: {
        browser: true,
        es2021: true,
    },
    extends: "eslint:recommended",
    parserOptions: {
        ecmaVersion: "latest",
    },
    rules: {
        "arrow-spacing": "error",
        "block-spacing": "error",
        "brace-style": "error",
        "comma-dangle": ["error", "only-multiline"],
        "comma-spacing": "error",
        "comma-style": ["error", "last"],
        "curly": ["error", "multi-line", "consistent"],
        "eol-last": "error",
        "func-call-spacing": "error",
        "function-call-argument-newline": ["error", "consistent"],
        "function-paren-newline": ["error", "consistent"],
        "indent": ["error", 4],
        "key-spacing": "error",
        "keyword-spacing": "error",
        "linebreak-style": ["error", "unix"],
        "no-extra-semi": "error",
        "no-mixed-spaces-and-tabs": "error",
        "no-multi-spaces": "error",
        "no-redeclare": ["error", {builtinGlobals: false}],
        "no-trailing-spaces": "error",
        "no-unused-vars": "off",
        "no-whitespace-before-property": "error",
        "object-curly-newline": ["error", {consistent: true, multiline: true}],
        "object-curly-spacing": ["error", "never"],
        "operator-linebreak": ["error", "after"],
        "quote-props": ["error", "consistent-as-needed"],
        "semi": ["error", "always"],
        "semi-spacing": "error",
        "semi-style": ["error", "last"],
        "space-before-blocks": "error",
        "space-before-function-paren": ["error", "never"],
        "space-in-parens": ["error", "never"],
        "space-infix-ops": "error",
        "space-unary-ops": "error",
        "switch-colon-spacing": "error",
        "template-curly-spacing": ["error", "never"],
        "unicode-bom": "error",
    },
    globals: {
        //script.js
        gradioApp: "readonly",
        executeCallbacks: "readonly",
        onAfterUiUpdate: "readonly",
        onOptionsChanged: "readonly",
        onUiLoaded: "readonly",
        onUiUpdate: "readonly",
        uiCurrentTab: "writable",
        uiElementInSight: "readonly",
        uiElementIsVisible: "readonly",
        //ui.js
        opts: "writable",
        all_gallery_buttons: "readonly",
        selected_gallery_button: "readonly",
        selected_gallery_index: "readonly",
        switch_to_txt2img: "readonly",
        switch_to_img2img_tab: "readonly",
        switch_to_img2img: "readonly",
        switch_to_sketch: "readonly",
        switch_to_inpaint: "readonly",
        switch_to_inpaint_sketch: "readonly",
        switch_to_extras: "readonly",
        get_tab_index: "readonly",
        create_submit_args: "readonly",
        restart_reload: "readonly",
        updateInput: "readonly",
        //extraNetworks.js
        requestGet: "readonly",
        popup: "readonly",
        // from python
        localization: "readonly",
        // progrssbar.js
        randomId: "readonly",
        requestProgress: "readonly",
        // imageviewer.js
        modalPrevImage: "readonly",
        modalNextImage: "readonly",
        // token-counters.js
        setupTokenCounters: "readonly",
    }
};

.git-blame-ignore-revs

0 → 100644
+2 −0
Original line number Original line Diff line number Diff line
# Apply ESlint
9c54b78d9dde5601e916f308d9a9d6953ec39430
 No newline at end of file
+40 −2
Original line number Original line Diff line number Diff line
@@ -43,10 +43,19 @@ body:
  - type: input
  - type: input
    id: commit
    id: commit
    attributes:
    attributes:
      label: Commit where the problem happens
      label: Version or Commit where the problem happens
      description: Which commit are you running ? (Do not write *Latest version/repo/commit*, as this means nothing and will have changed by the time we read your issue. Rather, copy the **Commit** link at the bottom of the UI, or from the cmd/terminal if you can't launch it.)
      description: "Which webui version or commit are you running ? (Do not write *Latest Version/repo/commit*, as this means nothing and will have changed by the time we read your issue. Rather, copy the **Version: v1.2.3** link at the bottom of the UI, or from the cmd/terminal if you can't launch it.)"
    validations:
    validations:
      required: true
      required: true
  - type: dropdown
    id: py-version
    attributes:
      label: What Python version are you running on ?
      multiple: false
      options:
        - Python 3.10.x
        - Python 3.11.x (above, no supported yet)
        - Python 3.9.x (below, no recommended)
  - type: dropdown
  - type: dropdown
    id: platforms
    id: platforms
    attributes:
    attributes:
@@ -59,6 +68,35 @@ body:
        - iOS
        - iOS
        - Android
        - Android
        - Other/Cloud
        - Other/Cloud
  - type: dropdown
    id: device
    attributes:
        label: What device are you running WebUI on?
        multiple: true
        options:
        - Nvidia GPUs (RTX 20 above)
        - Nvidia GPUs (GTX 16 below)
        - AMD GPUs (RX 6000 above)
        - AMD GPUs (RX 5000 below)
        - CPU
        - Other GPUs
  - type: dropdown
    id: cross_attention_opt
    attributes:
      label: Cross attention optimization
      description: What cross attention optimization are you using, Settings -> Optimizations -> Cross attention optimization
      multiple: false
      options:
        - Automatic
        - xformers
        - sdp-no-mem
        - sdp
        - Doggettx
        - V1 
        - InvokeAI
        - "None "
    validations:
      required: true
  - type: dropdown
  - type: dropdown
    id: browsers
    id: browsers
    attributes:
    attributes:
+10 −23
Original line number Original line Diff line number Diff line
# Please read the [contributing wiki page](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Contributing) before submitting a pull request!
## Description


If you have a large change, pay special attention to this paragraph:
* a simple description of what you're trying to accomplish
* a summary of changes in code
* which issues it fixes, if any


> Before making changes, if you think that your feature will result in more than 100 lines changing, find me and talk to me about the feature you are proposing. It pains me to reject the hard work someone else did, but I won't add everything to the repo, and it's better if the rejection happens before you have to waste time working on the feature.
## Screenshots/videos:


Otherwise, after making sure you're following the rules described in wiki page, remove this section and continue on.


**Describe what this pull request is trying to achieve.**
## Checklist:


A clear and concise description of what you're trying to accomplish with this, so your intent doesn't have to be extracted from your code.
- [ ] I have read [contributing wiki page](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Contributing)

- [ ] I have performed a self-review of my own code
**Additional notes and description of your changes**
- [ ] My code follows the [style guidelines](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Contributing#code-style)

- [ ] My code passes [tests](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Tests)
More technical discussion about your changes go here, plus anything that a maintainer might have to specifically take a look at, or be wary of.

**Environment this was tested in**

List the environment you have developed / tested this on. As per the contributing page, changes should be able to work on Windows out of the box.
 - OS: [e.g. Windows, Linux]
 - Browser: [e.g. chrome, safari]
 - Graphics card: [e.g. NVIDIA RTX 2080 8GB, AMD RX 6600 8GB]

**Screenshots or videos of your changes**

If applicable, screenshots or a video showing off your changes. If it edits an existing UI, it should ideally contain a comparison of what used to be there, before your changes were made.

This is **required** for anything that touches the user interface.
 No newline at end of file
Loading