forked from ariatemplates/ariatemplates
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix ariatemplates#1074 aria.utils.Bridge now forwards url map and roo…
…t map to the popup This commit links the url map and root map of the popup window (created with aria.utils.Bridge) to the ones of the parent window. It also changes a bit the logic to create the urls of the framework and the skin included in the popup in order to make the bridge work better (especially, to make it work in the test environment). close ariatemplates#1075 close ariatemplates#1531
- Loading branch information
Showing
6 changed files
with
167 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * Copyright 2015 Amadeus s.a.s. | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| Aria.classDefinition({ | ||
| $classpath : "test.aria.utils.bridge.BridgeTest", | ||
| $extends : "aria.jsunit.TestCase", | ||
| $dependencies : ["aria.utils.Bridge"], | ||
| $prototype : { | ||
| tearDown: function () { | ||
| if (this.bridge) { | ||
| this.bridge.close(); | ||
| this.bridge.$dispose(); | ||
| this.bridge = null; | ||
| } | ||
| }, | ||
|
|
||
| testAsyncCheckDownloadMgrMaps : function () { | ||
| aria.core.DownloadMgr.updateRootMap({ | ||
| "bridgeTest": aria.core.DownloadMgr.resolveURL("test/aria/utils/bridge/root", true) + "/" | ||
| }); | ||
| aria.core.DownloadMgr.updateUrlMap({ | ||
| "bridgeTest": { | ||
| "BridgeCtrl": "bridgeTest/BridgeCtrl-abcde.js", | ||
| "BridgeTpl": "bridgeTest/BridgeTpl-efghi.tpl" | ||
| } | ||
| }); | ||
|
|
||
| var bridge = this.bridge = new aria.utils.Bridge(); | ||
| bridge.open({ | ||
| title: "BridgeWindow", | ||
| moduleCtrlClasspath: "bridgeTest.BridgeCtrl", | ||
| displayClasspath: "bridgeTest.BridgeTpl" | ||
| }); | ||
|
|
||
| this.waitFor({ | ||
| condition: function () { | ||
| return !! bridge._subWindow.document && bridge._subWindow.document.getElementById("myElementIsThere"); | ||
| }, | ||
| callback: function () { | ||
| // checks that changing the root map and the url map in the main window is reflected | ||
| // in the sub window as maps are linked | ||
| aria.core.DownloadMgr.updateRootMap({ | ||
| "bridgeTest": { | ||
| "later": aria.core.DownloadMgr.resolveURL("test/aria/utils/bridge/laterRoot", true) + "/" | ||
| } | ||
| }); | ||
| aria.core.DownloadMgr.updateUrlMap({ | ||
| "bridgeTest": { | ||
| "later" : { | ||
| "LaterClass": "LaterClass-xyz.js" | ||
| } | ||
| } | ||
| }); | ||
| bridge._subWindow.Aria.load({ | ||
| classes: ["bridgeTest.later.LaterClass"], | ||
| oncomplete: { | ||
| scope: this, | ||
| fn: function () { | ||
| this.assertEquals(bridge._subWindow.bridgeTest.later.LaterClass.value, "OK-LOADED"); | ||
| this.notifyTestEnd(); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * Copyright 2015 Amadeus s.a.s. | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| Aria.classDefinition({ | ||
| $classpath: "bridgeTest.later.LaterClass", | ||
| $singleton: true, | ||
| $prototype: { | ||
| value: "OK-LOADED" | ||
| } | ||
| }); |
24 changes: 24 additions & 0 deletions
24
test/aria/utils/bridge/root/bridgeTest/BridgeCtrl-abcde.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Copyright 2015 Amadeus s.a.s. | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| Aria.classDefinition({ | ||
| $classpath: "bridgeTest.BridgeCtrl", | ||
| $extends: "aria.templates.ModuleCtrl", | ||
| $prototype: { | ||
| init: function (initArgs, cb) { | ||
| this.$callback(cb); | ||
| } | ||
| } | ||
| }); |
24 changes: 24 additions & 0 deletions
24
test/aria/utils/bridge/root/bridgeTest/BridgeTpl-efghi.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Copyright 2015 Amadeus s.a.s. | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| {Template { | ||
| $classpath : "bridgeTest.BridgeTpl" | ||
| }} | ||
|
|
||
| {macro main()} | ||
| Hello <div id="myElementIsThere"></div> | ||
| {/macro} | ||
|
|
||
| {/Template} |