From 81bea17aefb26859f825b9293c7c99192874806e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 8 Nov 2011 20:40:44 +0400 Subject: upgrade Dojo to 1.6.1 --- lib/dijit/layout/LinkPane.js | 51 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 10 deletions(-) (limited to 'lib/dijit/layout/LinkPane.js') diff --git a/lib/dijit/layout/LinkPane.js b/lib/dijit/layout/LinkPane.js index 38e6567e7..34e2d92bb 100644 --- a/lib/dijit/layout/LinkPane.js +++ b/lib/dijit/layout/LinkPane.js @@ -1,20 +1,51 @@ /* - Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved. + Copyright (c) 2004-2011, The Dojo Foundation All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified BSD license. see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.layout.LinkPane"]){ -dojo._hasResource["dijit.layout.LinkPane"]=true; +if(!dojo._hasResource["dijit.layout.LinkPane"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. +dojo._hasResource["dijit.layout.LinkPane"] = true; dojo.provide("dijit.layout.LinkPane"); dojo.require("dijit.layout.ContentPane"); dojo.require("dijit._Templated"); -dojo.declare("dijit.layout.LinkPane",[dijit.layout.ContentPane,dijit._Templated],{templateString:"
",postMixInProperties:function(){ -if(this.srcNodeRef){ -this.title+=this.srcNodeRef.innerHTML; -} -this.inherited(arguments); -},_fillContent:function(_1){ -}}); + + +dojo.declare("dijit.layout.LinkPane", + [dijit.layout.ContentPane, dijit._Templated], + { + // summary: + // A ContentPane with an href where (when declared in markup) + // the title is specified as innerHTML rather than as a title attribute. + // description: + // LinkPane is just a ContentPane that is declared in markup similarly + // to an anchor. The anchor's body (the words between `` and ``) + // become the title of the widget (used for TabContainer, AccordionContainer, etc.) + // example: + // | my title + + // I'm using a template because the user may specify the input as + // title, in which case we need to get rid of the + // because we don't want a link. + templateString: '
', + + postMixInProperties: function(){ + // If user has specified node contents, they become the title + // (the link must be plain text) + if(this.srcNodeRef){ + this.title += this.srcNodeRef.innerHTML; + } + this.inherited(arguments); + }, + + _fillContent: function(/*DomNode*/ source){ + // Overrides _Templated._fillContent(). + + // _Templated._fillContent() relocates srcNodeRef innerHTML to templated container node, + // but in our case the srcNodeRef innerHTML is the title, so shouldn't be + // copied + } +}); + } -- cgit v1.2.3