FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Comparing master...pr-239-clean · qmlweb/qmlweb · GitHub

/ qmlweb Public
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: qmlweb/qmlweb
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
Could not load branches
Nothing to show
{{ refName }}
...
head repository: qmlweb/qmlweb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: pr-239-clean
Choose a head ref
Could not load branches
Nothing to show
{{ refName }}
Checking mergeability… Don’t worry, you can still create the pull request.
  • 2 commits
  • 18 files changed
  • 1 contributor

Commits on Aug 14, 2016

  1. Only access constructors from current file scope 

    This also supports importing a module with a qualifier.

Previously, the global "constructors" was used, which is overwritten as
the imports of each component file are loaded.

This repurposes the previously unused "perContextConstructors". This has
been renamed to "perImportContextConstructors", since the modules that
are available to a QMLContext are not necessarily the same as the other
variables that are available.

This adds an "importContextId" property to both QMLComponent and
QMLContext.

"importContextId" is set to a unique value on a QMLComponent if it has
imports, and the constructors found for those imports are then stored in
"perImportContextConstructors", keyed by the "importContextId" and module
qualifier, if there is one.

"importContextId" is then forwarded to the QMLContext that is passed into
the root object that is created for the QMLComponent, so that it is
accessible to any further "construct" calls made.

"importContextId" is also overwritten on the "componentScope" that is
passed into "applyProperties", as we want any children that are created
to use the constructors for the Component they are defined within, not
the Component they are a child of.

PR-URL: #239
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
    stephenmdangelo authored and ChALkeR committed Aug 14, 2016
    Configuration menu
    Copy the full SHA
    194c590 View commit details
    Browse the repository at this point in the history

  2. Directory imports are now local to a Component file and can be qualified 

    The "importContextId" introduced in the previous commit is used to keep
a per-Component map of qualified directory paths and paths to search for
unqualified Component creation.

PR-URL: #239
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
    stephenmdangelo authored and ChALkeR committed Aug 14, 2016
    Configuration menu
    Copy the full SHA
    d5343d1 View commit details
    Browse the repository at this point in the history
Loading
Back | FazBrowse Home | New Git URL