Skip to content

Commit

Permalink
Update dojo 1.9.3 -> 1.10.4
Browse files Browse the repository at this point in the history
The version we have is old and until Sandcastle gets its much needed
makeover, we should stay current with dependancies.
  • Loading branch information
mramato committed Nov 21, 2015
1 parent 06be660 commit 7f5cf31
Show file tree
Hide file tree
Showing 2,751 changed files with 163,560 additions and 64,385 deletions.
4 changes: 2 additions & 2 deletions Apps/Sandcastle/CesiumSandcastle.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url('../../ThirdParty/dojo-release-1.9.3/dijit/themes/claro/claro.css');
@import url('../../ThirdParty/dojo-release-1.10.4/dijit/themes/claro/claro.css');

html, body {
height: 100%;
Expand Down Expand Up @@ -253,4 +253,4 @@ a.linkButton:focus, a.linkButton:hover {

.CodeMirror-gutter-text {
cursor: default;
}
}
4 changes: 2 additions & 2 deletions Apps/Sandcastle/CesiumSandcastle.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ require({
baseUrl : '../../Source',
packages : [{
name : 'dojo',
location : '../ThirdParty/dojo-release-1.9.3/dojo'
location : '../ThirdParty/dojo-release-1.10.4/dojo'
}, {
name : 'dijit',
location : '../ThirdParty/dojo-release-1.9.3/dijit'
location : '../ThirdParty/dojo-release-1.10.4/dijit'
}, {
name : 'Sandcastle',
location : '../Apps/Sandcastle'
Expand Down
2 changes: 1 addition & 1 deletion Apps/Sandcastle/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</script>
<script src="../../ThirdParty/jshint-2.1.10/jshint.js"></script>

<script data-dojo-config="async: 1, tlmSiblingOfDojo: 0" src="../../ThirdParty/dojo-release-1.9.3/dojo/dojo.js"></script>
<script data-dojo-config="async: 1, tlmSiblingOfDojo: 0" src="../../ThirdParty/dojo-release-1.10.4/dojo/dojo.js"></script>

<script src="jsHintOptions.js"></script>
<script src="gallery/gallery-index.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions Apps/TimelineDemo/boot.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ require({
baseUrl : '../..',
packages : [{
name : 'dojo',
location : 'ThirdParty/dojo-release-1.9.3/dojo'
location : 'ThirdParty/dojo-release-1.10.4/dojo'
}, {
name : 'dijit',
location : 'ThirdParty/dojo-release-1.9.3/dijit'
location : 'ThirdParty/dojo-release-1.10.4/dijit'
}, {
name : 'Core',
location : 'Source/Core'
Expand Down Expand Up @@ -41,4 +41,4 @@ require({

parser.parse();
domClass.remove(win.body(), 'loading');
});
});
4 changes: 2 additions & 2 deletions Apps/TimelineDemo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Timeline Demo</title>
<style type="text/css">
@import url('../../ThirdParty/dojo-release-1.9.3/dijit/themes/claro/claro.css');
@import url('../../ThirdParty/dojo-release-1.10.4/dijit/themes/claro/claro.css');
@import url('../../Source/Widgets/Animation/Animation.css');
@import url('../../Source/Widgets/Animation/lighter.css');
@import url('../../Source/Widgets/Timeline/Timeline.css');
Expand Down Expand Up @@ -147,7 +147,7 @@
}
</style>
<script data-dojo-config="async: 1, tlmSiblingOfDojo: 0"
src="../../ThirdParty/dojo-release-1.9.3/dojo/dojo.js"></script>
src="../../ThirdParty/dojo-release-1.10.4/dojo/dojo.js"></script>
<script type="text/javascript" src="boot.js"></script>
</head>
<body class="claro cesium-lighter">
Expand Down
40 changes: 40 additions & 0 deletions ThirdParty/dojo-release-1.10.4/dijit/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Set the default behavior, in case users don't have core.autocrlf set
* text=auto

# Files that should always be normalized and converted to native line
# endings on checkout.
*.js text
*.json text
*.htm text
*.html text
*.svg text
*.txt text
*.xml text
*.xsl text
*.dtd text
*.css text
*.rest text
*.rst text
*.md text
*.php text
*.phps text
*.inc text
*.sh text
*.bat text
*.styl text
*.less text
Makefile text
README text
CHANGELOG text
LICENSE text
INSTALL text
BUILD text

# Files that are truly binary and should not be modified
*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.jar binary
*.zip binary
*.psd binary
118 changes: 118 additions & 0 deletions ThirdParty/dojo-release-1.10.4/dijit/BackgroundIframe.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
define([
"require", // require.toUrl
"./main", // to export dijit.BackgroundIframe
"dojo/_base/config",
"dojo/dom-construct", // domConstruct.create
"dojo/dom-style", // domStyle.set
"dojo/_base/lang", // lang.extend lang.hitch
"dojo/on",
"dojo/sniff" // has("ie"), has("trident"), has("quirks")
], function(require, dijit, config, domConstruct, domStyle, lang, on, has){

// module:
// dijit/BackgroundIFrame

// Flag for whether to create background iframe behind popups like Menus and Dialog.
// A background iframe is useful to prevent problems with popups appearing behind applets/pdf files,
// and is also useful on older versions of IE (IE6 and IE7) to prevent the "bleed through select" problem.
// By default, it's enabled for IE6-10, excluding Windows Phone 8,
// and it's also enabled for IE11 on Windows 7 and Windows 2008 Server.
// TODO: For 2.0, make this false by default. Also, possibly move definition to has.js so that this module can be
// conditionally required via dojo/has!bgIfame?dijit/BackgroundIframe
has.add("config-bgIframe",
(has("ie") && !/IEMobile\/10\.0/.test(navigator.userAgent)) || // No iframe on WP8, to match 1.9 behavior
(has("trident") && /Windows NT 6.[01]/.test(navigator.userAgent)));

var _frames = new function(){
// summary:
// cache of iframes

var queue = [];

this.pop = function(){
var iframe;
if(queue.length){
iframe = queue.pop();
iframe.style.display="";
}else{
// transparency needed for DialogUnderlay and for tooltips on IE (to see screen near connector)
if(has("ie") < 9){
var burl = config["dojoBlankHtmlUrl"] || require.toUrl("dojo/resources/blank.html") || "javascript:\"\"";
var html="<iframe src='" + burl + "' role='presentation'"
+ " style='position: absolute; left: 0px; top: 0px;"
+ "z-index: -1; filter:Alpha(Opacity=\"0\");'>";
iframe = document.createElement(html);
}else{
iframe = domConstruct.create("iframe");
iframe.src = 'javascript:""';
iframe.className = "dijitBackgroundIframe";
iframe.setAttribute("role", "presentation");
domStyle.set(iframe, "opacity", 0.1);
}
iframe.tabIndex = -1; // Magic to prevent iframe from getting focus on tab keypress - as style didn't work.
}
return iframe;
};

this.push = function(iframe){
iframe.style.display="none";
queue.push(iframe);
}
}();


dijit.BackgroundIframe = function(/*DomNode*/ node){
// summary:
// For IE/FF z-index shenanigans. id attribute is required.
//
// description:
// new dijit.BackgroundIframe(node).
//
// Makes a background iframe as a child of node, that fills
// area (and position) of node

if(!node.id){ throw new Error("no id"); }
if(has("config-bgIframe")){
var iframe = (this.iframe = _frames.pop());
node.appendChild(iframe);
if(has("ie")<7 || has("quirks")){
this.resize(node);
this._conn = on(node, 'resize', lang.hitch(this, "resize", node));
}else{
domStyle.set(iframe, {
width: '100%',
height: '100%'
});
}
}
};

lang.extend(dijit.BackgroundIframe, {
resize: function(node){
// summary:
// Resize the iframe so it's the same size as node.
// Needed on IE6 and IE/quirks because height:100% doesn't work right.
if(this.iframe){
domStyle.set(this.iframe, {
width: node.offsetWidth + 'px',
height: node.offsetHeight + 'px'
});
}
},
destroy: function(){
// summary:
// destroy the iframe
if(this._conn){
this._conn.remove();
this._conn = null;
}
if(this.iframe){
this.iframe.parentNode.removeChild(this.iframe);
_frames.push(this.iframe);
delete this.iframe;
}
}
});

return dijit.BackgroundIframe;
});
Loading

0 comments on commit 7f5cf31

Please sign in to comment.