Skip to content

Commit

Permalink
Merging StoyanCheresharov JS files
Browse files Browse the repository at this point in the history
  • Loading branch information
wingman007 committed Mar 6, 2013
1 parent 54fc03d commit 6afb7a8
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 56 deletions.
34 changes: 17 additions & 17 deletions StoyanCheresharov/js/exp_dijit.js
Original file line number Diff line number Diff line change
@@ -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();
});
});
36 changes: 18 additions & 18 deletions StoyanCheresharov/js/exp_dojo.js
Original file line number Diff line number Diff line change
@@ -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();
});
4 changes: 2 additions & 2 deletions StoyanCheresharov/js/exp_dojo_bg.js
Original file line number Diff line number Diff line change
@@ -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!";
});
38 changes: 19 additions & 19 deletions StoyanCheresharov/js/exp_jquery.js
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 6afb7a8

Please sign in to comment.