Ignore:
Timestamp:
03/13/13 17:07:58 (12 years ago)
Author:
hendrikvanantwerpen
Message:

Added grunt tasks and code cleanup.

Added grunt for less and jshint procesing.
Cleanup of code to pass jshint (one bug found :).

Location:
Dev/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • Dev/trunk

    • Property svn:ignore

      •  

        old new  
        11data
        22nbproject
         3node_modules

  • Dev/trunk/client

    • Property svn:externals

      •  

        old new  
        1 dojo http://svn.dojotoolkit.org/src/tags/release-1.8.0/dojo
        2 dijit http://svn.dojotoolkit.org/src/tags/release-1.8.0/dijit
        3 dojox http://svn.dojotoolkit.org/src/tags/release-1.8.0/dojox
        4 util http://svn.dojotoolkit.org/src/tags/release-1.8.0/util
         1dojo http://svn.dojotoolkit.org/src/tags/release-1.8.3/dojo
         2dijit http://svn.dojotoolkit.org/src/tags/release-1.8.3/dijit
         3dojox http://svn.dojotoolkit.org/src/tags/release-1.8.3/dojox
         4util http://svn.dojotoolkit.org/src/tags/release-1.8.3/util

  • Dev/trunk/client/qed/lib/async.js

    r420 r426  
    11define([
    2      'dojo/_base/array',
    3      'dojo/_base/lang',
    4      'dojo/when',
    5      'dojo/Deferred'
     2    'dojo/_base/array',
     3    'dojo/_base/lang',
     4    'dojo/when',
     5    'dojo/Deferred'
    66],function(array,lang,when,Deferred){
    77
    … …  
    2020        var running = null;
    2121        function cancel(err) {
    22             if ( cancelled ) return;
     22            if ( cancelled ) { return; }
    2323            cancelled = true;
    24             running && running.cancel && !running.isFulfilled() && running.cancel();
     24            if ( running && running.cancel && !running.isFulfilled() ) {
     25                running.cancel();
     26            }
    2527            d.reject(err);
    2628        }
    2729
    2830        function update(fs,arg) {
    29             if ( cancelled ) return;
     31            if ( cancelled ) { return; }
    3032            if ( fs.length > 0 ) {
    3133                try {
    … …  
    5860     */
    5961    function par(functions,ctx) {
    60         var d = new Deferred(cancel);
    61 
     62        var d; // later: Deferred
     63       
    6264        var cancelled = false;
    6365        var running = [];
    6466        function cancel(err) {
    65             if (cancelled) return;
     67            if (cancelled) { return; }
    6668            cancelled = true;
    6769            array.forEach(running,function(running){
    68                 running && running.cancel && !running.isFulfilled() && running.cancel();
     70                if ( running && running.cancel && !running.isFulfilled() ) {
     71                    running.cancel();
     72                }
    6973            });
    7074            d.reject(err);
    7175        }
    7276
     77        d = new Deferred(cancel);
     78
    7379        var results = [];
    7480        var left = functions.length;
    7581        function update(res,idx) {
    76             if (cancelled) return;
     82            if (cancelled) { return; }
    7783            results[idx] = res;
    7884            left -= 1; // Works because/as long as AJAX/JS is single-threaded.
    … …  
    8389
    8490        array.forEach(functions,function(f,idx){
    85             if (cancelled) return;
     91            if (cancelled) { return; }
    8692            try {
    8793                running.push(when(f.call(ctx)).then(function(res){
Note: See TracChangeset for help on using the changeset viewer.