commit/galaxy-central: carlfeberhard: UI: remove template for popupmenu (inside view now)
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/bd89b1ef5a95/ Changeset: bd89b1ef5a95 User: carlfeberhard Date: 2013-10-23 19:24:46 Summary: UI: remove template for popupmenu (inside view now) Affected #: 5 files diff -r c3179a238f97fdf7b1f159b32d276a4a596a7e9e -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad static/scripts/packed/templates/compiled/template-popupmenu-menu.js --- a/static/scripts/packed/templates/compiled/template-popupmenu-menu.js +++ /dev/null @@ -1,1 +0,0 @@ -(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a["template-popupmenu-menu"]=b(function(g,s,q,l,x){this.compilerInfo=[4,">= 1.0.0"];q=this.merge(q,g.helpers);x=x||{};var r="",i,f,d="function",c=this.escapeExpression,p=this;function o(B,A){var y="",z;y+="\n ";z=q.each.call(B,B.options,{hash:{},inverse:p.noop,fn:p.program(2,n,A),data:A});if(z||z===0){y+=z}y+="\n";return y}function n(B,A){var y="",z;y+="\n ";z=q["if"].call(B,B.divider,{hash:{},inverse:p.program(5,k,A),fn:p.program(3,m,A),data:A});if(z||z===0){y+=z}y+="\n ";return y}function m(z,y){return'\n <li class="divider"></li>\n '}function k(B,A){var y="",z;y+="\n ";z=q["if"].call(B,B.header,{hash:{},inverse:p.program(8,h,A),fn:p.program(6,j,A),data:A});if(z||z===0){y+=z}y+="\n ";return y}function j(B,A){var y="",z;y+='\n <li class="head"><a href=""javascript:void(0);">';if(z=q.html){z=z.call(B,{hash:{},data:A})}else{z=B.html;z=typeof z===d?z.apply(B):z}if(z||z===0){y+=z}y+="</a></li>\n ";return y}function h(B,A){var y="",z;y+='\n \n <li><a href="';z=q["if"].call(B,B.href,{hash:{},inverse:p.program(11,w,A),fn:p.program(9,e,A),data:A});if(z||z===0){y+=z}y+='"\n ';z=q["if"].call(B,B.href,{hash:{},inverse:p.noop,fn:p.program(13,v,A),data:A});if(z||z===0){y+=z}y+=' class="popupmenu-option">\n ';z=q["if"].call(B,B.checked,{hash:{},inverse:p.noop,fn:p.program(15,u,A),data:A});if(z||z===0){y+=z}y+="\n ";if(z=q.html){z=z.call(B,{hash:{},data:A})}else{z=B.html;z=typeof z===d?z.apply(B):z}if(z||z===0){y+=z}y+="\n </a></li>\n ";return y}function e(A,z){var y;if(y=q.href){y=y.call(A,{hash:{},data:z})}else{y=A.href;y=typeof y===d?y.apply(A):y}return c(y)}function w(z,y){return"javascript:void(0);"}function v(B,A){var y="",z;y+='target="';if(z=q.target){z=z.call(B,{hash:{},data:A})}else{z=B.target;z=typeof z===d?z.apply(B):z}y+=c(z)+'"';return y}function u(z,y){return'<span class="fa-icon-ok"></span>'}function t(z,y){return"\n <li>No Options.</li>\n"}r+='<ul id="';if(i=q.id){i=i.call(s,{hash:{},data:x})}else{i=s.id;i=typeof i===d?i.apply(s):i}r+=c(i)+'-menu" class="dropdown-menu">\n';f=q["if"].call(s,((i=s.options),i==null||i===false?i:i.length),{hash:{},inverse:p.program(17,t,x),fn:p.program(1,o,x),data:x});if(f||f===0){r+=f}r+="\n</ul>";return r})})(); \ No newline at end of file diff -r c3179a238f97fdf7b1f159b32d276a4a596a7e9e -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad static/scripts/templates/compiled/template-popupmenu-menu.js --- a/static/scripts/templates/compiled/template-popupmenu-menu.js +++ /dev/null @@ -1,119 +0,0 @@ -(function() { - var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {}; -templates['template-popupmenu-menu'] = template(function (Handlebars,depth0,helpers,partials,data) { - this.compilerInfo = [4,'>= 1.0.0']; -helpers = this.merge(helpers, Handlebars.helpers); data = data || {}; - var buffer = "", stack1, stack2, functionType="function", escapeExpression=this.escapeExpression, self=this; - -function program1(depth0,data) { - - var buffer = "", stack1; - buffer += "\n "; - stack1 = helpers.each.call(depth0, depth0.options, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\n"; - return buffer; - } -function program2(depth0,data) { - - var buffer = "", stack1; - buffer += "\n "; - stack1 = helpers['if'].call(depth0, depth0.divider, {hash:{},inverse:self.program(5, program5, data),fn:self.program(3, program3, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\n "; - return buffer; - } -function program3(depth0,data) { - - - return "\n <li class=\"divider\"></li>\n "; - } - -function program5(depth0,data) { - - var buffer = "", stack1; - buffer += "\n "; - stack1 = helpers['if'].call(depth0, depth0.header, {hash:{},inverse:self.program(8, program8, data),fn:self.program(6, program6, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\n "; - return buffer; - } -function program6(depth0,data) { - - var buffer = "", stack1; - buffer += "\n <li class=\"head\"><a href=\"\"javascript:void(0);\">"; - if (stack1 = helpers.html) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.html; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "</a></li>\n "; - return buffer; - } - -function program8(depth0,data) { - - var buffer = "", stack1; - buffer += "\n " - + "\n <li><a href=\""; - stack1 = helpers['if'].call(depth0, depth0.href, {hash:{},inverse:self.program(11, program11, data),fn:self.program(9, program9, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\"\n "; - stack1 = helpers['if'].call(depth0, depth0.href, {hash:{},inverse:self.noop,fn:self.program(13, program13, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += " class=\"popupmenu-option\">\n "; - stack1 = helpers['if'].call(depth0, depth0.checked, {hash:{},inverse:self.noop,fn:self.program(15, program15, data),data:data}); - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\n "; - if (stack1 = helpers.html) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.html; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\n </a></li>\n "; - return buffer; - } -function program9(depth0,data) { - - var stack1; - if (stack1 = helpers.href) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.href; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - return escapeExpression(stack1); - } - -function program11(depth0,data) { - - - return "javascript:void(0);"; - } - -function program13(depth0,data) { - - var buffer = "", stack1; - buffer += "target=\""; - if (stack1 = helpers.target) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.target; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - buffer += escapeExpression(stack1) - + "\""; - return buffer; - } - -function program15(depth0,data) { - - - return "<span class=\"fa-icon-ok\"></span>"; - } - -function program17(depth0,data) { - - - return "\n <li>No Options.</li>\n"; - } - - buffer += "<ul id=\""; - if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); } - else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } - buffer += escapeExpression(stack1) - + "-menu\" class=\"dropdown-menu\">\n"; - stack2 = helpers['if'].call(depth0, ((stack1 = depth0.options),stack1 == null || stack1 === false ? stack1 : stack1.length), {hash:{},inverse:self.program(17, program17, data),fn:self.program(1, program1, data),data:data}); - if(stack2 || stack2 === 0) { buffer += stack2; } - buffer += "\n</ul>"; - return buffer; - }); -})(); \ No newline at end of file diff -r c3179a238f97fdf7b1f159b32d276a4a596a7e9e -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad static/scripts/templates/ui-templates.html --- a/static/scripts/templates/ui-templates.html +++ b/static/scripts/templates/ui-templates.html @@ -17,28 +17,3 @@ </div></div></script> - -<script type="text/template" class="template-ui" id="template-popupmenu-menu"> -<ul id="{{ id }}-menu" class="dropdown-menu"> -{{#if options.length }} - {{#each options }} - {{#if divider }} - <li class="divider"></li> - {{else}} - {{#if header }} - <li class="head"><a href=""javascript:void(0);">{{{ html }}}</a></li> - {{else}} - {{!NOTE: changed from # to void fn }} - <li><a href="{{#if href }}{{ href }}{{else}}javascript:void(0);{{/if}}" - {{#if href }}target="{{ target }}"{{/if}} class="popupmenu-option"> - {{#if checked }}<span class="fa-icon-ok"></span>{{/if}} - {{{ html }}} - </a></li> - {{/if}} - {{/if}} - {{/each}} -{{else}} - <li>No Options.</li> -{{/if}} -</ul> -</script> diff -r c3179a238f97fdf7b1f159b32d276a4a596a7e9e -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad templates/base.mako --- a/templates/base.mako +++ b/templates/base.mako @@ -45,14 +45,7 @@ "libs/backbone/backbone", "libs/backbone/backbone-relational", "libs/handlebars.runtime", - "galaxy.base" - )} - - ${h.templates( - "template-popupmenu-menu" - )} - - ${h.js( + "galaxy.base", "mvc/ui" )} diff -r c3179a238f97fdf7b1f159b32d276a4a596a7e9e -r bd89b1ef5a95cd9ca8de04a829043788e9dde0ad templates/base/base_panels.mako --- a/templates/base/base_panels.mako +++ b/templates/base/base_panels.mako @@ -56,14 +56,7 @@ 'libs/backbone/backbone-relational', 'libs/handlebars.runtime', 'galaxy.base', - 'libs/require' - )} - - ${h.templates( - "template-popupmenu-menu" - )} - - ${h.js( + 'libs/require', "mvc/ui" )} Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply＠bitbucket.org