Commit 9dc0425d authored by Bastien Roucariès's avatar Bastien Roucariès

Import dojo_1.14.2+dfsg1.orig.tar.gz

parent af8d4f6d
{
"name": "dojo-themes",
"name": "dijit-themes",
"licenses": [ "BSD-3-Clause", "AFL-2.1"],
"ignore": [
".*"
......
{
"name": "dojo-themes",
"version": "1.14.1",
"name": "dijit-themes",
"version": "1.14.2",
"description": "Dojo 1.x modern themes",
"license" : "BSD-3-Clause OR AFL-2.1",
"bugs": "http://bugs.dojotoolkit.org/",
......@@ -12,8 +12,8 @@
},
"dojoBuild": "themes.profile.js",
"peerDependencies": {
"dojo": "1.14.1",
"dijit": "1.14.1"
"dojo": "1.14.2",
"dijit": "1.14.2"
},
"devDependencies": {
"grunt": "^0.4",
......
......@@ -437,14 +437,33 @@ define([
viewport.h *= this.maxRatio;
var bb = domGeometry.position(this.domNode);
if(bb.w >= viewport.w || bb.h >= viewport.h){
this._shrunk = false;
// First check and limit width, because limiting the width may increase the height due to word wrapping.
if(bb.w >= viewport.w){
dim = {
w: Math.min(bb.w, viewport.w),
h: Math.min(bb.h, viewport.h)
w: viewport.w
};
domGeometry.setMarginBox(this.domNode, dim);
bb = domGeometry.position(this.domNode);
this._shrunk = true;
}else{
this._shrunk = false;
}
// Now check and limit the height
if(bb.h >= viewport.h){
if(!dim){
dim = {
w: bb.w
};
}
dim.h = viewport.h;
this._shrunk = true;
}
if(dim){
if(!dim.w){
dim.w = bb.w;
}
if(!dim.h){
dim.h = bb.h;
}
}
}
......
......@@ -15,7 +15,7 @@
"url": "https://github.com/dojo/dijit.git"
},
"dependencies": {
"dojo": "1.14.1"
"dojo": "1.14.2"
},
"devDependencies": {
}
......
......@@ -135,13 +135,19 @@ define([
this._decimalInfo = getDecimalInfo(constraints);
},
_onFocus: function(){
_onFocus: function(/*String*/ by){
if(this.disabled || this.readOnly){ return; }
var val = this.get('value');
if(typeof val == "number" && !isNaN(val)){
var formattedValue = this.format(val, this.constraints);
if(formattedValue !== undefined){
this.textbox.value = formattedValue;
// when NumberTextBox or descendants (i.e. CurrencyTextBox) format textbox.value when focused
// all browsers except Chrome will select textbox contents when tabbed to by keyboard
// force selection if not focused by mouse
if (by !== "mouse") {
this.textbox.select();
}
}
}
this.inherited(arguments);
......
{
"name": "dijit",
"version": "1.14.1",
"version": "1.14.2",
"directories": {
"lib": "."
},
"main": "main",
"dependencies": {
"dojo": "1.14.1"
"dojo": "1.14.2"
},
"description": "Dijit provides a complete collection of user interface controls based on Dojo, giving you the power to create web applications that are highly optimized for usability, performance, internationalization, accessibility, but above all deliver an incredible user experience.",
"license" : "BSD-3-Clause OR AFL-2.1",
......
......@@ -79,7 +79,7 @@ define(["../global", "../has", "./config", "require", "module"], function(global
dojo.isAsync = !has("dojo-loader") || require.async;
dojo.locale = config.locale;
var rev = "$Rev: c38f5a72 $".match(/[0-9a-f]{7,}/);
var rev = "$Rev: d6e8ff38 $".match(/[0-9a-f]{7,}/);
dojo.version = {
// summary:
// Version number of the Dojo Toolkit
......@@ -92,7 +92,7 @@ define(["../global", "../has", "./config", "require", "module"], function(global
// - flag: String: Descriptor flag. If total version is "1.2.0beta1", will be "beta1"
// - revision: Number: The Git rev from which dojo was pulled
major: 1, minor: 14, patch: 1, flag: "",
major: 1, minor: 14, patch: 2, flag: "",
revision: rev ? rev[0] : NaN,
toString: function(){
var v = dojo.version;
......
......@@ -1761,7 +1761,7 @@
errorDisconnector = domOn(node, "error", "onerror", function(e){
loadDisconnector();
errorDisconnector();
signal(error, makeError("scriptError", [url, e]));
signal(error, makeError("scriptError: " + url, [url, e]));
});
node.type = "text/javascript";
......
{
"name": "dojo",
"version": "1.14.1",
"version": "1.14.2",
"directories": {
"lib": "."
},
......@@ -11,7 +11,7 @@
"jsgi-node": "0.3.1",
"formidable": "1.0.17",
"sinon": "1.12.2",
"dojo": "1.14.1"
"dojo": "1.14.2"
},
"main": "main",
"scripts": {
......
......@@ -14,7 +14,7 @@ define([
var tval = target[name],
sval = source[name];
if (tval !== sval) {
if (sval && typeof sval === 'object' && !(sval instanceof FormData)) {
if (sval && typeof sval === 'object' && !(has('native-formdata') && sval instanceof FormData)) {
if (Object.prototype.toString.call(sval) === '[object Date]') { // use this date test to handle crossing frame boundaries
target[name] = new Date(sval);
} else if (lang.isArray(sval)) {
......
......@@ -15,8 +15,8 @@
"url": "https://github.com/dojo/dojox.git"
},
"dependencies": {
"dojo": "1.14.1",
"dijit": "1.14.1"
"dojo": "1.14.2",
"dijit": "1.14.2"
},
"devDependencies": {
}
......
{
"name": "dojox",
"version": "1.14.1",
"version": "1.14.2",
"directories": {
"lib": "."
},
"main": "main",
"dependencies": {
"dojo": "1.14.1",
"dijit": "1.14.1"
"dojo": "1.14.2",
"dijit": "1.14.2"
},
"description": "Dojo eXtensions, a rollup of many useful sub-projects and varying states of maturity – from very stable and robust, to alpha and experimental. See individual projects contain README files for details.",
"license" : "BSD-3-Clause OR AFL-2.1",
......
......@@ -14,9 +14,9 @@
"url": "https://github.com/dojo/util.git"
},
"dependencies": {
"dojo": "1.14.1",
"dijit": "1.14.1",
"dojox": "1.14.1",
"dojo": "1.14.2",
"dijit": "1.14.2",
"dojox": "1.14.2",
"dijit-themes": "1.14.0"
},
"devDependencies": {
......
define([], function(){
var
rev = "$Rev: 8e36ced $".match(/[0-9a-f]{7,}/),
rev = "$Rev: 5c5bf28 $".match(/[0-9a-f]{7,}/),
version= {
major: 1, minor: 14, patch: 1, flag: "",
major: 1, minor: 14, patch: 2, flag: "",
revision: rev ? rev[0] : NaN,
toString: function(){
var v= version;
......
......@@ -21,7 +21,7 @@ define(["doh/runner", "require", "dojo/_base/config"], function(doh, require, co
};
console.log("\n"+doh._line);
console.log("The Dojo Unit Test Harness, $Rev: 8e36ced $");
console.log("The Dojo Unit Test Harness, $Rev: 5c5bf28 $");
console.log("Copyright (c) 2018, The JS Foundation, All Rights Reserved");
console.log("Running with node.js");
for (var tests= [], args= config["commandLineArgs"], i= 0, arg; i<args.length; i++) {
......
......@@ -21,7 +21,7 @@ define(["doh/runner", "require", "dojo/_base/config"], function(doh, require, co
};
print("\n"+doh._line);
print("The Dojo Unit Test Harness, $Rev: 8e36ced $");
print("The Dojo Unit Test Harness, $Rev: 5c5bf28 $");
print("Copyright (c) 2018, The JS Foundation, All Rights Reserved");
for (var tests= [], args= config["commandLineArgs"], i= 0, arg; i<args.length; i++) {
arg= (args[i]+"").split("=");
......
<!DOCTYPE html>
<html style="height:100%;">
<head>
<title>The Dojo Unit Test Harness, $Rev: 8e36ced $</title>
<title>The Dojo Unit Test Harness, $Rev: 5c5bf28 $</title>
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1"/>
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
......
{
"name": "doh",
"version": "1.14.1",
"version": "1.14.2",
"directories": {
"lib": "."
},
......
<!DOCTYPE html>
<html style="height:100%;">
<head>
<title>The Dojo Unit Test Harness, $Rev: 8e36ced $</title>
<title>The Dojo Unit Test Harness, $Rev: 5c5bf28 $</title>
<script type="text/javascript" src="_parseURLargs.js"></script>
......
{
"name": "dojo-util",
"version": "1.14.1",
"version": "1.14.2",
"licenses": [
{
"type": "AFLv2.1",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment