From 6afb7a840dbefc9a201ac45965b0a38bfe98c707 Mon Sep 17 00:00:00 2001 From: Stoyan Cheresharov Date: Wed, 6 Mar 2013 14:19:48 +0200 Subject: [PATCH] Merging StoyanCheresharov JS files --- StoyanCheresharov/js/exp_dijit.js | 34 +++++++++++++------------- StoyanCheresharov/js/exp_dojo.js | 36 +++++++++++++-------------- StoyanCheresharov/js/exp_dojo_bg.js | 4 +-- StoyanCheresharov/js/exp_jquery.js | 38 ++++++++++++++--------------- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/StoyanCheresharov/js/exp_dijit.js b/StoyanCheresharov/js/exp_dijit.js index 957cf246..dba2ff2b 100644 --- a/StoyanCheresharov/js/exp_dijit.js +++ b/StoyanCheresharov/js/exp_dijit.js @@ -1,18 +1,18 @@ -require(["dojo/ready", "dijit/layout/AccordionContainer", "dijit/layout/ContentPane"], function(ready, AccordionContainer, ContentPane){ - ready(function(){ - var aContainer = new AccordionContainer({style:"height: 300px"}, "markup"); - aContainer.addChild(new ContentPane({ - title: "This is a content pane", - content: "Hi!" - })); - aContainer.addChild(new ContentPane({ - title:"This is as well", - content:"Hi how are you?" - })); - aContainer.addChild(new ContentPane({ - title:"This too", - content:"Hello im fine.. thnx" - })); - aContainer.startup(); - }); +require(["dojo/ready", "dijit/layout/AccordionContainer", "dijit/layout/ContentPane"], function(ready, AccordionContainer, ContentPane){ + ready(function(){ + var aContainer = new AccordionContainer({style:"height: 300px"}, "markup"); + aContainer.addChild(new ContentPane({ + title: "This is a content pane", + content: "Hi!" + })); + aContainer.addChild(new ContentPane({ + title:"This is as well", + content:"Hi how are you?" + })); + aContainer.addChild(new ContentPane({ + title:"This too", + content:"Hello im fine.. thnx" + })); + aContainer.startup(); + }); }); \ No newline at end of file diff --git a/StoyanCheresharov/js/exp_dojo.js b/StoyanCheresharov/js/exp_dojo.js index 8b05088a..ecbe4fef 100644 --- a/StoyanCheresharov/js/exp_dojo.js +++ b/StoyanCheresharov/js/exp_dojo.js @@ -1,19 +1,19 @@ -require(["dojo/dom", "dojo/domReady!"], function(dom){ - dom.byId("myDiv").innerHTML = "Hello New World!"; -}); - -require(["dojo/dom", "dojo/string", "dojo/domReady!"], function(dom, string){ - dom.byId("someNode").innerHTML = string.trim(" I Like Trim Strings "); -}); - -require(["dojo/dom", "dojo/fx", "dojo/domReady!"], function(dom, fx){ - // The piece we had before... - var greeting = dom.byId("greeting"); - greeting.innerHTML += " from Dojo!"; - // ...but now, with an animation! - fx.slideTo({ - top: 100, - left: 200, - node: greeting - }).play(); +require(["dojo/dom", "dojo/domReady!"], function(dom){ + dom.byId("myDiv").innerHTML = "Hello New World!"; +}); + +require(["dojo/dom", "dojo/string", "dojo/domReady!"], function(dom, string){ + dom.byId("someNode").innerHTML = string.trim(" I Like Trim Strings "); +}); + +require(["dojo/dom", "dojo/fx", "dojo/domReady!"], function(dom, fx){ + // The piece we had before... + var greeting = dom.byId("greeting"); + greeting.innerHTML += " from Dojo!"; + // ...but now, with an animation! + fx.slideTo({ + top: 100, + left: 200, + node: greeting + }).play(); }); \ No newline at end of file diff --git a/StoyanCheresharov/js/exp_dojo_bg.js b/StoyanCheresharov/js/exp_dojo_bg.js index c61edc83..4bbbc165 100644 --- a/StoyanCheresharov/js/exp_dojo_bg.js +++ b/StoyanCheresharov/js/exp_dojo_bg.js @@ -1,3 +1,3 @@ -require(["dojo/dom", "dojo/domReady!"], function(dom){ - dom.byId("myDiv").innerHTML = "Hello New World!"; +require(["dojo/dom", "dojo/domReady!"], function(dom){ + dom.byId("myDiv").innerHTML = "Hello New World!"; }); \ No newline at end of file diff --git a/StoyanCheresharov/js/exp_jquery.js b/StoyanCheresharov/js/exp_jquery.js index 864cf472..381f7895 100644 --- a/StoyanCheresharov/js/exp_jquery.js +++ b/StoyanCheresharov/js/exp_jquery.js @@ -1,19 +1,19 @@ -/* -(function(){ - window.onload = function(e){ - var divs = $("div"); - // alert(divs[0]); - $("p.details").css("background-color", "yellow").show("fast"); - }; -})(); -*/ - -$(function(){ - var divs = $("div"); - alert(divs[0]); - $("p.details").css("background-color", "yellow").show("fast"); - $("p.details").text('Changed by jQuery'); -}); - -// var jQuery = function(){}; -// var $ = jQuery; +/* +(function(){ + window.onload = function(e){ + var divs = $("div"); + // alert(divs[0]); + $("p.details").css("background-color", "yellow").show("fast"); + }; +})(); +*/ + +$(function(){ + var divs = $("div"); + alert(divs[0]); + $("p.details").css("background-color", "yellow").show("fast"); + $("p.details").text('Changed by jQuery'); +}); + +// var jQuery = function(){}; +// var $ = jQuery;