[commits-cosmo] (travis) [6154] Fix for bug 11294 + a couple missing id fixes.

[Travis Vachon]

This was a merge of r6153 from the 0.9 branch.

On Nov 8, 2007, at 3:40 PM, svncheckin at osafoundation.org wrote:

> Revision
> 6154
> Author
> travis
> Date
> 2007-11-08 15:40:48 -0800 (Thu, 08 Nov 2007)
> Log Message
>
> Fix for bug 11294 + a couple missing id fixes.
> Modified Paths
>
> cosmo/trunk/cosmo/src/main/webapp/js/cosmo/app.js
> cosmo/trunk/cosmo/src/main/webapp/js/cosmo/ui/widget/ 
> CollectionDetailsDialog.js
> cosmo/trunk/cosmo/src/main/webapp/js/cosmo/ui/widget/templates/ 
> CollectionDetailsDialog/CollectionDetailsDialog.html
> Diff
>
> Modified: cosmo/trunk/cosmo/src/main/webapp/js/cosmo/app.js (6153 =>  
> 6154)
>
> --- cosmo/trunk/cosmo/src/main/webapp/js/cosmo/app.js	2007-11-08  
> 23:39:36 UTC (rev 6153)
> +++ cosmo/trunk/cosmo/src/main/webapp/js/cosmo/app.js	2007-11-08  
> 23:40:48 UTC (rev 6154)
> @@ -210,6 +210,7 @@
>          var valueInput = _createElem("input");
>          valueInput.value = defaultValue || "";
>          valueInput.type = "text";
> +        valueInput.id = "getValueInput";
>          retryConditions = retryConditions || [];
>          var deferred = new dojo.Deferred();
>          var submitFunc = dojo.lang.hitch(this, function () {
> @@ -282,11 +283,11 @@
>          var deferred = new dojo.Deferred();
>          var yesFunc = dojo.lang.hitch(this, function () {
>              this.hideDialog();
> -            deferred.callback();
> +            deferred.callback(true);
>          })
>          var noFunc = dojo.lang.hitch(this, function () {
>              this.hideDialog();
> -            deferred.errback();
> +            deferred.callback(false);
>          })
>          var yesButton = new cosmo.ui.button.Button(
>                                { text:_('App.Button.Yes'),
> Modified: cosmo/trunk/cosmo/src/main/webapp/js/cosmo/ui/widget/ 
> CollectionDetailsDialog.js (6153 => 6154)
>
> --- cosmo/trunk/cosmo/src/main/webapp/js/cosmo/ui/widget/ 
> CollectionDetailsDialog.js	2007-11-08 23:39:36 UTC (rev 6153)
> +++ cosmo/trunk/cosmo/src/main/webapp/js/cosmo/ui/widget/ 
> CollectionDetailsDialog.js	2007-11-08 23:40:48 UTC (rev 6154)
> @@ -196,16 +196,20 @@
>                      return e;
>                  });
>              confirmDeferred.addCallback(
> -                function(){
> -                     
> cosmo.app.modalDialog.setPrompt(_('App.Status.Processing'));
> -                    var deleteDeferred =
> -                         
> cosmo.app.pim.serv.deleteCollection(collectionToDelete);
> -                    deleteDeferred.addCallback(function(){
> -                         
> cosmo.app.pim.collections.removeItem(collectionToDelete.getUid());
> -                         
> cosmo.topics.publish(cosmo.topics.CollectionDeletedMessage,
> -                                             [collectionToDelete]);
> +                function(confirmed){
> +                    if (confirmed){
> +                         
> cosmo.app.modalDialog.setPrompt(_('App.Status.Processing'));
> +                        var deleteDeferred =
> +                             
> cosmo.app.pim.serv.deleteCollection(collectionToDelete);
> +                        deleteDeferred.addCallback(function(){
> +                             
> cosmo.app.pim.collections.removeItem(collectionToDelete.getUid());
> +                             
> cosmo.topics.publish(cosmo.topics.CollectionDeletedMessage,
> +                                                  
> [collectionToDelete]);
> +                            cosmo.app.hideDialog();
> +                        });
> +                    } else {
>                          cosmo.app.hideDialog();
> -                    });
> +                    }
>                  }
>              );
>
> Modified: cosmo/trunk/cosmo/src/main/webapp/js/cosmo/ui/widget/ 
> templates/CollectionDetailsDialog/CollectionDetailsDialog.html (6153  
> => 6154)
>
> --- cosmo/trunk/cosmo/src/main/webapp/js/cosmo/ui/widget/templates/ 
> CollectionDetailsDialog/CollectionDetailsDialog.html	2007-11-08  
> 23:39:36 UTC (rev 6153)
> +++ cosmo/trunk/cosmo/src/main/webapp/js/cosmo/ui/widget/templates/ 
> CollectionDetailsDialog/CollectionDetailsDialog.html	2007-11-08  
> 23:40:48 UTC (rev 6154)
> @@ -44,7 +44,7 @@
>      </td>
>      <td>
>        <input  dojoAttachPoint="deleteCollectionButton"
> -              type="button" class="btnElemBaseSm"
> +              type="button" class="btnElemBaseSm"  
> id="deleteCollectionButton"
>                style="width: 86px;" value="$ 
> {this.strings.deleteCollectionButton}"
>                dojoAttachEvent="onClick: _handleDelete;"/>
>      </td>
>
> _______________________________________________
> Commits-Cosmo mailing list
> Commits-Cosmo at osafoundation.org
> http://lists.osafoundation.org/cgi-bin/mailman/listinfo/commits-cosmo

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osafoundation.org/pipermail/commits-cosmo/attachments/20071108/4e9f7359/attachment-0001.html