[Pkg-javascript-commits] [dojo] 09/88: Various DOH robot updates:

David Prévot taffit at moszumanska.debian.org
Thu Aug 21 17:39:30 UTC 2014


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.8.5
in repository dojo.

commit ffc6bd0481e461ca2364ff62eaf43dd5ea1e5e3c
Author: Bill Keese <bill at dojotoolkit.org>
Date:   Mon Aug 20 03:44:05 2012 +0000

    Various DOH robot updates:
    
       - Don't include dijit code into page with robot test code; dijit should only be loaded in the content iframe.
       - Fix double scrollbar on tests (on IE8) caused by overflow:visible setting on <html>
       - Prefer dojo/domReady! to dojo/ready, in order to support other AMD loaders.   However, dojo/ready is still needed for the outer frame to detect when the inner frame (with the content) has completed initializing.
       - Since robot depends on dojo, use domClass.add() and remove() to add dohRobot class to <html> node, to avoid getting a space character in the class string.
    
     Fixes #15865, refs #15616 on 1.8/ branch !strict.
    
    git-svn-id: http://svn.dojotoolkit.org/src/branches/1.8/dojo@29506 560b804f-0ae3-0310-86f3-f6aa0a117693
---
 robotx.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/robotx.js b/robotx.js
index e0466d1..9382211 100644
--- a/robotx.js
+++ b/robotx.js
@@ -1,4 +1,5 @@
 define([
+	"require",
 	"doh/main",
 	"./aspect",
 	"./dom-construct",
@@ -6,11 +7,10 @@ define([
 	"./_base/kernel",
 	"./_base/lang",
 	"./on",
-	"./ready",
 	"./robot",
 	"./sniff",
 	"./_base/window"
-], function(doh, aspect, construct, style, kernel, lang, on, ready, robot, has, win){
+], function(require, doh, aspect, construct, style, kernel, lang, on, robot, has, win){
 
 kernel.experimental("dojo.robotx");
 
@@ -34,7 +34,6 @@ var iframeUrl;
 var groupStarted = aspect.after(doh, "_groupStarted", function(){
 	groupStarted.remove();
 	iframe.style.visibility = "visible";
-	iframe.style.visibility = "visible";
 }, true);
 
 var iframeLoad;
@@ -43,9 +42,9 @@ var attachIframe = function(url){
 	// summary:
 	//		Create iframe to load external app at specified url, and call iframeLoad() when that URL finishes loading
 
-	ready(function(){
+	require(["./domReady!"], function(){
 		var emptyStyle = {
-			overflow: has("webkit") ? "hidden" : "visible",
+			overflow: "hidden",
 			margin: "0px",
 			borderWidth: "0px",
 			height: "100%",
@@ -57,7 +56,6 @@ var attachIframe = function(url){
 		// Create the iframe for the external document.   Put it above the firebug-lite div (if such a div exists).
 		// console.log("creating iframe for external document");
 		iframe = document.createElement("iframe");
-		iframe.src = url;
 		iframe.setAttribute("ALLOWTRANSPARENCY","true");
 		iframe.scrolling = has("ie") ? "yes" : "auto";
 		var scrollRoot = document.compatMode == "BackCompat" ? document.body : document.documentElement;
@@ -70,6 +68,7 @@ var attachIframe = function(url){
 			width: "100%",
 			height: consoleHeight ? (scrollRoot.clientHeight - consoleHeight)+"px" : "100%"
 		});
+		iframe.src = url;
 		if(iframe.attachEvent !== undefined){
 			iframe.attachEvent("onload", iframeLoad);
 		}else{

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git



More information about the Pkg-javascript-commits mailing list