Commit 6887a0f5 authored by Anders Kaseorg's avatar Anders Kaseorg

lib: Upgrade Dojo and Dijit from 1.8.3 to 1.12.1

The itemNode and expandoNode elements have changed from img to
span (https://bugs.dojotoolkit.org/ticket/16699), so we now put our
tree icons inside them rather than replacing them.
Signed-off-by: default avatarAnders Kaseorg <andersk@mit.edu>
parent 9f539be3

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -417,10 +417,8 @@ button[disabled],
border-color: rgba(82, 168, 236, 0.8);
}
.claro .dijitMenu .dijitMenuItem.dijitHover,
.claro .dijitMenu .dijitMenuItem.dijitFocused,
.claro .dijitMenuTable .dijitMenuItem.dijitHover .dijitMenuItemLabel,
.claro .dijitMenuTable .dijitMenuItem.dijitFocused .dijitMenuItemLabel {
.claro .dijitMenu .dijitMenuItemSelected,
.claro .dijitMenu .dijitMenuItemSelected td {
background : rgb(82, 168, 236);
color : white;
border-color : rgba(82, 168, 236, 0.8);
......
......@@ -104,8 +104,14 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"]
_createTreeNode: function(args) {
var tnode = new dijit._TreeNode(args);
if (args.item.icon && args.item.icon[0])
tnode.iconNode.src = args.item.icon[0];
var icon = dojo.doc.createElement('img');
if (args.item.icon && args.item.icon[0]) {
icon.src = args.item.icon[0];
} else {
icon.src = 'images/blank_icon.gif';
}
icon.className = 'tinyFeedIcon';
domConstruct.place(icon, tnode.iconNode, 'only');
var id = args.item.id[0];
var bare_id = parseInt(id.substr(id.indexOf(':')+1));
......@@ -121,7 +127,7 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"]
color: fg_color,
backgroundColor: bg_color});
domConstruct.place(span, tnode.iconNode, 'replace');
domConstruct.place(span, tnode.iconNode, 'only');
}
if (id.match("FEED:")) {
......@@ -358,7 +364,10 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"]
if (treeNode) {
treeNode = treeNode[0];
treeNode.iconNode.src = src;
var icon = dojo.doc.createElement('img');
icon.src = src;
icon.className = 'tinyFeedIcon';
domConstruct.place(icon, treeNode.iconNode, 'only');
return true;
}
return false;
......@@ -375,7 +384,9 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"]
treeNode.loadingNode.src = src;
return true;
} else {
treeNode.expandoNode.src = src;
var icon = dojo.doc.createElement('img');
icon.src = src;
domConstruct.place(icon, treeNode.expandoNode, 'only');
return true;
}
}
......
......@@ -23,8 +23,12 @@ require(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functi
_createTreeNode: function(args) {
var tnode = this.inherited(arguments);
if (args.item.icon)
tnode.iconNode.src = args.item.icon[0];
if (args.item.icon) {
var icon = dojo.doc.createElement('img');
icon.src = args.item.icon[0];
icon.className = 'tinyFeedIcon';
domConstruct.place(icon, tnode.iconNode, 'only');
}
var param = this.model.store.getValue(args.item, 'param');
......
//>>built
define("dijit/BackgroundIframe",["require","./main","dojo/_base/config","dojo/dom-construct","dojo/dom-style","dojo/_base/lang","dojo/on","dojo/sniff","dojo/_base/window"],function(_1,_2,_3,_4,_5,_6,on,_7,_8){var _9=new function(){var _a=[];this.pop=function(){var _b;if(_a.length){_b=_a.pop();_b.style.display="";}else{if(_7("ie")<9){var _c=_3["dojoBlankHtmlUrl"]||_1.toUrl("dojo/resources/blank.html")||"javascript:\"\"";var _d="<iframe src='"+_c+"' role='presentation'"+" style='position: absolute; left: 0px; top: 0px;"+"z-index: -1; filter:Alpha(Opacity=\"0\");'>";_b=_8.doc.createElement(_d);}else{_b=_4.create("iframe");_b.src="javascript:\"\"";_b.className="dijitBackgroundIframe";_b.setAttribute("role","presentation");_5.set(_b,"opacity",0.1);}_b.tabIndex=-1;}return _b;};this.push=function(_e){_e.style.display="none";_a.push(_e);};}();_2.BackgroundIframe=function(_f){if(!_f.id){throw new Error("no id");}if(_7("ie")||_7("mozilla")){var _10=(this.iframe=_9.pop());_f.appendChild(_10);if(_7("ie")<7||_7("quirks")){this.resize(_f);this._conn=on(_f,"resize",_6.hitch(this,function(){this.resize(_f);}));}else{_5.set(_10,{width:"100%",height:"100%"});}}};_6.extend(_2.BackgroundIframe,{resize:function(_11){if(this.iframe){_5.set(this.iframe,{width:_11.offsetWidth+"px",height:_11.offsetHeight+"px"});}},destroy:function(){if(this._conn){this._conn.remove();this._conn=null;}if(this.iframe){_9.push(this.iframe);delete this.iframe;}}});return _2.BackgroundIframe;});
\ No newline at end of file
define("dijit/BackgroundIframe",["require","./main","dojo/_base/config","dojo/dom-construct","dojo/dom-style","dojo/_base/lang","dojo/on","dojo/sniff"],function(_1,_2,_3,_4,_5,_6,on,_7){_7.add("config-bgIframe",(_7("ie")||_7("trident"))&&!/IEMobile\/10\.0/.test(navigator.userAgent));var _8=new function(){var _9=[];this.pop=function(){var _a;if(_9.length){_a=_9.pop();_a.style.display="";}else{if(_7("ie")<9){var _b=_3["dojoBlankHtmlUrl"]||_1.toUrl("dojo/resources/blank.html")||"javascript:\"\"";var _c="<iframe src='"+_b+"' role='presentation'"+" style='position: absolute; left: 0px; top: 0px;"+"z-index: -1; filter:Alpha(Opacity=\"0\");'>";_a=document.createElement(_c);}else{_a=_4.create("iframe");_a.src="javascript:\"\"";_a.className="dijitBackgroundIframe";_a.setAttribute("role","presentation");_5.set(_a,"opacity",0.1);}_a.tabIndex=-1;}return _a;};this.push=function(_d){_d.style.display="none";_9.push(_d);};}();_2.BackgroundIframe=function(_e){if(!_e.id){throw new Error("no id");}if(_7("config-bgIframe")){var _f=(this.iframe=_8.pop());_e.appendChild(_f);if(_7("ie")<7||_7("quirks")){this.resize(_e);this._conn=on(_e,"resize",_6.hitch(this,"resize",_e));}else{_5.set(_f,{width:"100%",height:"100%"});}}};_6.extend(_2.BackgroundIframe,{resize:function(_10){if(this.iframe){_5.set(this.iframe,{width:_10.offsetWidth+"px",height:_10.offsetHeight+"px"});}},destroy:function(){if(this._conn){this._conn.remove();this._conn=null;}if(this.iframe){this.iframe.parentNode.removeChild(this.iframe);_8.push(this.iframe);delete this.iframe;}}});return _2.BackgroundIframe;});
\ No newline at end of file
_Do you have a contribution? We welcome contributions, but please ensure that you read the following information
before issuing a pull request. Also refer back to this document as a checklist before issuing your pull request.
This will save time for everyone._
# Before You Start
## Understanding the Basics
If you don't understand what a *pull request* is, or how to submit one, please refer to the [help documentation][]
provided by GitHub.
## Is It Really a Support Issue
If you aren't sure if your contribution is needed or necessary, please visit the [support forum][] before attempting to
submit a pull request or a ticket.
## Search Dojo Toolkit's Bug Database
We require every commit to be tracked via our [bug database][]. It is useful, before you get too far, that you have
checked that your issue isn't already known, otherwise addressed? If you think it is a valid defect or enhancement,
please open a new ticket before submitting your pull request.
## Discuss Non-Trivial Contributions with the Committers
If your desired contribution is more than a non-trivial fix, you should discuss it on the
[contributor's mailing list][dojo-contrib]. If you currently are not a member, you can request to be added.
## Contributor License Agreement
We require all contributions, to be covered under the JS Foundation's [Contributor License Agreement][cla]. This can
be done electronically and essentially ensures that you are making it clear that your contributions are your
contributions, you have the legal right to contribute and you are transferring the copyright of your works to the Dojo
Foundation.
If you are an unfamiliar contributor to the committer assessing your pull request, it is best to make it clear how
you are covered by a CLA in the notes of the pull request. A bot will verify your status.
If your GitHub user id you are submitting your pull request from differs from the e-mail address
which you have signed your CLA under, you should specifically note what you have your CLA filed under.
# Submitting a Pull Request
The following are the general steps you should follow in creating a pull request. Subsequent pull requests only need
to follow step 3 and beyond:
1. Fork the repository on GitHub
2. Clone the forked repository to your machine
3. Create a "feature" branch in your local repository
4. Make your changes and commit them to your local repository
5. Rebase and push your commits to your GitHub remote fork/repository
6. Issue a Pull Request to the official repository
7. Your Pull Request is reviewed by a committer and merged into the repository
*Note* While there are other ways to accomplish the steps using other tools, the examples here will assume the most
actions will be performed via the `git` command line.
## 1. Fork the Repository
When logged into your GitHub account, and you are viewing one of the main repositories, you will see the *Fork* button.
Clicking this button will show you which repositories your can fork to. Choose your own account. Once the process
finishes, you will have your own repository that is "forked" from the GitHub one.
Forking is a GitHub term and not a git term. Git is a wholly distributed source control system and simply worries
about local and remote repositories and allows you to manage your code against them. GitHub then adds this additional
layer of structure of how repositories can relate to each other.
## 2. Clone the Forked Repository
Once you have successfully forked your repository, you will need to clone it locally to your machine:
```bash
$ git clone --recursive git@github.com:username/dijit.git
```
This will clone your fork to your current path in a directory named `dijit`.
It is important that you clone recursively for ``dojox``, ``demos`` or ``util``because some of the code is contained in
submodules. You won't be able to submit your changes to the repositories that way though. If you are working on any of
these sub-projects, you should contact those project leads to see if their workflow differs.
You should also setup the `upstream` repository. This will allow you to take changes from the "master" repository
and merge them into your local clone and then push them to your GitHub fork:
```bash
$ cd dojo
$ git remote add upstream git@github.com:dojo/dijit.git
$ git fetch upstream
```
Then you can retrieve upstream changes and rebase on them into your code like this:
```bash
$ git pull --rebase upstream master
```
For more information on maintaining a fork, please see the GitHub Help article [Fork a Repo][] and information on
[rebasing][] from git.
## 3. Create a Branch
The easiest workflow is to keep your master branch in sync with the upstream branch and do not locate any of your own
commits in that branch. When you want to work on a new feature, you then ensure you are on the master branch and create
a new branch from there. While the name of the branch can be anything, it can often be easy to use the ticket number
you might be working on. For example:
```bash
$ git checkout -b t12345 master
Switched to a new branch 't12345'
```
You will then be on the feature branch. You can verify what branch you are on like this: