Skip to content

Commit

Permalink
Merge pull request #736 from peuter/fix-scriptloader
Browse files Browse the repository at this point in the history 
fix loading of unknown plugins in build
  • Loading branch information
@ChristianMayer
ChristianMayer committed Oct 20, 2018
2 parents d2b3c72 + 1e08a2b commit 263be9c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion external/qooxdoo
Submodule qooxdoo updated 76 files
+23 −12 .travis.yml
+1 −1 .travis/coverage
+14 −2 .travis/test
+10 −1 framework/karma.conf.js
+1 −0 framework/package.json
+7 −0 framework/source/class/qx/Class.js
+32 −1 framework/source/class/qx/Promise.js
+9 −2 framework/source/class/qx/Theme.js
+1 −1 framework/source/class/qx/bom/IframeHistory.js
+1 −1 framework/source/class/qx/bom/Stylesheet.js
+1 −1 framework/source/class/qx/bom/client/Stylesheet.js
+1 −1 framework/source/class/qx/data/Array.js
+83 −3 framework/source/class/qx/data/controller/List.js
+4 −1 framework/source/class/qx/data/controller/MSelection.js
+13 −1 framework/source/class/qx/data/marshal/IMarshalerDelegate.js
+19 −1 framework/source/class/qx/data/marshal/Json.js
+38 −6 framework/source/class/qx/dev/Debug.js
+1 −1 framework/source/class/qx/dev/unit/AbstractTestSuite.js
+1 −1 framework/source/class/qx/dev/unit/JsUnitTestResult.js
+1 −1 framework/source/class/qx/dev/unit/MRequirementsBasic.js
+2 −2 framework/source/class/qx/dev/unit/MTestLoader.js
+3 −3 framework/source/class/qx/dev/unit/TestFunction.js
+4 −4 framework/source/class/qx/dev/unit/TestResult.js
+1 −1 framework/source/class/qx/event/Manager.js
+4 −3 framework/source/class/qx/event/handler/DragDrop.js
+1 −72 framework/source/class/qx/event/handler/Keyboard.js
+10 −1 framework/source/class/qx/event/message/Message.js
+2 −2 framework/source/class/qx/html/Element.js
+1 −1 framework/source/class/qx/io/part/ClosurePart.js
+1 −1 framework/source/class/qx/io/part/Part.js
+2 −2 framework/source/class/qx/io/remote/RequestQueue.js
+1 −1 framework/source/class/qx/locale/LocalizedString.js
+33 −0 framework/source/class/qx/test/Promise.js
+1 −1 framework/source/class/qx/test/bom/GeoLocation.js
+25 −7 framework/source/class/qx/test/data/marshal/Json.js
+1 −1 framework/source/class/qx/test/data/store/Json.js
+1 −1 framework/source/class/qx/test/io/part/ClosurePart.js
+1 −1 framework/source/class/qx/test/io/part/Part.js
+4 −0 framework/source/class/qx/test/ui/embed/Flash.js
+5 −3 framework/source/class/qx/test/ui/form/VirtualSelectBox.js
+4 −4 framework/source/class/qx/type/BaseArray.js
+22 −20 framework/source/class/qx/ui/basic/Image.js
+15 −9 framework/source/class/qx/ui/core/Blocker.js
+10 −10 framework/source/class/qx/ui/core/MChildrenHandling.js
+1 −1 framework/source/class/qx/ui/core/MLayoutHandling.js
+20 −2 framework/source/class/qx/ui/core/MMultiSelectionHandling.js
+14 −14 framework/source/class/qx/ui/core/MRemoteChildrenHandling.js
+16 −16 framework/source/class/qx/ui/core/Widget.js
+1 −1 framework/source/class/qx/ui/form/AbstractSelectBox.js
+8 −11 framework/source/class/qx/ui/form/MModelSelection.js
+22 −1 framework/source/class/qx/ui/form/SelectBox.js
+1 −1 framework/source/class/qx/ui/layout/HBox.js
+2 −2 framework/source/class/qx/ui/list/core/IListDelegate.js
+2 −2 framework/source/class/qx/ui/menu/Menu.js
+9 −9 framework/source/class/qx/ui/mobile/core/MChildrenHandling.js
+14 −14 framework/source/class/qx/ui/mobile/core/Widget.js
+1 −0 framework/source/class/qx/ui/mobile/form/CheckBox.js
+1 −0 framework/source/class/qx/ui/mobile/form/RadioButton.js
+1 −0 framework/source/class/qx/ui/mobile/form/TextArea.js
+1 −0 framework/source/class/qx/ui/mobile/form/ToggleButton.js
+1 −1 framework/source/class/qx/ui/table/Table.js
+1 −1 framework/source/class/qx/ui/table/pane/FocusIndicator.js
+10 −10 framework/source/class/qx/ui/tree/core/AbstractTreeItem.js
+1 −1 framework/source/class/qx/ui/tree/core/IVirtualTreeDelegate.js
+7 −7 framework/source/class/qx/ui/virtual/core/Pane.js
+1 −1 framework/source/class/qx/ui/virtual/selection/Abstract.js
+1 −1 framework/source/class/qx/ui/window/Desktop.js
+6 −6 framework/source/class/qx/ui/window/IWindowManager.js
+2 −2 framework/source/class/qx/ui/window/Window.js
+23 −11 framework/source/class/qx/util/DynamicScriptLoader.js
+13 −0 uitests/selectbox/.gitignore
+34 −0 uitests/selectbox/Manifest.json
+37 −0 uitests/selectbox/compile.json
+92 −0 uitests/selectbox/source/class/selectbox/Application.js
+104 −0 uitests/selectbox/source/class/selectbox/Issue9569Application.js
+0 −0 uitests/selectbox/source/translation/en.po
9 changes: 4 additions & 5 deletions source/class/cv/util/ScriptLoader.js
View file
Expand Up @@ -85,8 +85,9 @@ qx.Class.define('cv.util.ScriptLoader', {
// in source load all scripts
realQueue.push(qx.util.ResourceManager.getInstance().toUri(queue[i]) + suffix);
} else {
// in build do not load plugin scripts as they are included in the plugin script
if (queue[i].indexOf("plugins/") === -1) {
// in build do not load plugin dependency scripts as they are included in the plugin script
// unknown plugins should be loaded although
if (queue[i].indexOf("plugins/") === -1 || /resource\/plugins\/[^/]+\/index.js/.test(queue[i])) {
realQueue.push(qx.util.ResourceManager.getInstance().toUri(queue[i]) + suffix);
}
}
Expand Down Expand Up @@ -131,9 +132,7 @@ qx.Class.define('cv.util.ScriptLoader', {
loader.removeListener("loaded", this._onLoaded, this);
loader.removeListener("failed", this._onFailed, this);
}, this);
loader.start().catch(function () {
// do nothing here
});
loader.start();
return loader;
},

Expand Down

0 comments on commit 263be9c

Please sign in to comment.