Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/coolcsn/fmi into coolcsn-ma…
Browse files Browse the repository at this point in the history 
…ster
  • Loading branch information
@wingman007
wingman007 committed Mar 6, 2013
2 parents 4921a24 + 3886a4d commit 54fc03d
Show file tree
Hide file tree
Showing 34 changed files with 424 additions and 2 deletions.
1 change: 1 addition & 0 deletions .c9revisions/StoyanCheresharov/css/exp_dojo.css.c9save
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"ts":1362405725720,"silentsave":true,"restoring":false,"patch":[[]],"length":0}
3 changes: 3 additions & 0 deletions .c9revisions/StoyanCheresharov/css/exp_jquery.css.c9save
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{"ts":1362400019769,"silentsave":true,"restoring":false,"patch":[[{"diffs":[[1,"h1 {\n color: red; \n}"]],"start1":0,"start2":0,"length1":0,"length2":26}]],"length":26}
{"contributors":[],"silentsave":false,"ts":1362400261030,"patch":[[{"diffs":[[0,"d; \n}"],[1,"\n\np.details {\n color: blue;\n}"]],"start1":18,"start2":18,"length1":8,"length2":40}]],"length":58,"saved":false}
{"ts":1362400273977,"patch":[[{"diffs":[[0,"\n}\n\n"],[-1,"p"],[0,".det"]],"start1":24,"start2":24,"length1":9,"length2":8}]],"length":57,"saved":false}
2 changes: 2 additions & 0 deletions .c9revisions/StoyanCheresharov/exp_bg.html.c9save
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
{"contributors":[],"silentsave":false,"ts":1361520420246,"patch":[[{"diffs":[[1,"<!DOCTYPE html>\n<html>\n <head>\n <title>Exp BG</title>\n </head>\n <body>\n <h1>Exp BG</h1>\n </body>\n</html>"]],"start1":0,"start2":0,"length1":0,"length2":130}]],"length":130,"saved":false}
{"ts":1361520615381,"patch":[[{"diffs":[[0,"/title>\n"],[1," <link rel=\"stylesheet\" href=\"css/exp_bg.css\" type=\"text/css\" medea=\"screen\" title=\"exp_bg\" />\n"],[0," </he"]],"start1":56,"start2":56,"length1":16,"length2":118}]],"length":232,"saved":false}
{"ts":1361520731952,"patch":[[{"diffs":[[0,"_bg\" />\n"],[1," <script type=\"text/javascript\" src=\"js/exp_bg.js\"></script>\n"],[0," </he"]],"start1":158,"start2":158,"length1":16,"length2":84}]],"length":300,"saved":false}
{"contributors":[],"silentsave":false,"ts":1362124995744,"patch":[[{"diffs":[[0,"script>\n"],[1," <script type=\"text/javascript\" src=\"js/exp2_bg.js\"></script>\n"],[0," </he"]],"start1":226,"start2":226,"length1":16,"length2":85},{"diffs":[[0,"BG</h1>\n"],[1," <div id=\"myDiv\">Test</div>\n"],[0," </bo"]],"start1":342,"start2":342,"length1":16,"length2":51}]],"length":404,"saved":false}
{"ts":1362125299063,"patch":[[{"diffs":[[0,"cript>\n <"],[1,"!-- "],[0,"script type=\"tex"]],"start1":227,"start2":227,"length1":32,"length2":36},{"diffs":[[0,"js\"></script"],[1," --"],[0,">\n </head"]],"start1":293,"start2":293,"length1":24,"length2":27}]],"length":411,"saved":false}
18 changes: 18 additions & 0 deletions .c9revisions/StoyanCheresharov/exp_dojo.html.c9save
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{"ts":1362405633499,"silentsave":true,"restoring":false,"patch":[[]],"length":0}
{"contributors":[],"silentsave":false,"ts":1362405662960,"patch":[[{"diffs":[[1,"<!DOCTYPE html>\r\n<html>\r\n <head>\r\n <title>Experiment page for jQuery</title>\r\n <link rel=\"stylesheet\" href=\"css/exp_jquery.css\" type=\"text/css\" medea=\"screen\" title=\"exp_jquery\" />\r\n <!-- script src=\"http://code.jquery.com/jquery-1.9.1.min.js\"></script -->\r\n <!-- script src=\"http://code.jquery.com/jquery-migrate-1.1.1.min.js\"></script --> \r\n <script src=\"../public/js/jquery-1.9.1.min.js\" type=\"text/javascript\"></script>\r\n <script src=\"js/exp_jquery.js\" type=\"text/javascript\"></script>\r\n </head>\r\n <body>\r\n <h1>Exp for jQuery</h1>\r\n <div>This is a div element</div>\r\n <p class=\"details\">I am a detail</p>\r\n </body>\r\n</html>"]],"start1":0,"start2":0,"length1":0,"length2":709}]],"length":709,"saved":false}
{"ts":1362405767938,"patch":[[{"diffs":[[0,"age for "],[-1,"jQuery"],[1,"Dojo"],[0,"</title>"]],"start1":64,"start2":64,"length1":22,"length2":20},{"diffs":[[0,"css/exp_"],[-1,"jquery"],[1,"dojo"],[0,".css\" ty"]],"start1":123,"start2":123,"length1":22,"length2":20},{"diffs":[[0,"le=\"exp_"],[-1,"jquery"],[1,"dojo"],[0,"\" />\r\n "]],"start1":175,"start2":175,"length1":22,"length2":20},{"diffs":[[0,"o\" />\r\n <"],[-1,"!-- "],[0,"script src=\"http"]],"start1":186,"start2":186,"length1":36,"length2":32},{"diffs":[[0,"rc=\""],[-1,"http://code.jquery.com/jquery-1.9.1.min.js\"></script -->\r\n <!-- script src=\"http://code.jquery.com/jquery-migrate-1.1.1.min.js\"></script --> \r\n <script src=\"../public/js/jquery-1.9.1.min.js\" type=\"text/javascript\"></script>\r\n <script src=\"js/exp_jquery.js\" type=\"text/javascript"],[1,"//ajax.googleapis.com/ajax/libs/dojo/1.8.3/dojo/dojo.js"],[0,"\"></"]],"start1":210,"start2":210,"length1":314,"length2":63},{"diffs":[[0,"for "],[-1,"jQuery"],[1,"Dojo"],[0,"</h1"]],"start1":323,"start2":323,"length1":14,"length2":12}]],"length":446,"saved":false}
{"ts":1362405865028,"patch":[[{"diffs":[[0,"cript>\r\n"],[1," <script src=\"js/exp_dojo.js\"></script>\r\n"],[0," </he"]],"start1":274,"start2":274,"length1":16,"length2":64}]],"length":494,"saved":false}
{"ts":1362405983092,"patch":[[{"diffs":[[0,"il</p>\r\n"],[1," <div id=\"myDiv\">I should be replaced by Dojo</div>\r\n"],[0," </bo"]],"start1":466,"start2":466,"length1":16,"length2":76}]],"length":554,"saved":false}
{"ts":1362406052995,"patch":[[{"diffs":[[0,"jo\" />\r\n"],[1," <!-- CDN works it is not blocked by CLoid 9-->\r\n"],[0," "]],"start1":185,"start2":185,"length1":16,"length2":72}]],"length":610,"saved":false}
{"ts":1362406298883,"patch":[[{"diffs":[[0," 9-->\r\n <"],[1,"!-- "],[0,"script src=\"//aj"]],"start1":242,"start2":242,"length1":32,"length2":36},{"diffs":[[0,"js\"></script"],[1," -->\r\n <script src=\"../dojo/dojo.js\"\r\n data-dojo-config=\"async: true\"></script"],[0,">\r\n <"]],"start1":327,"start2":327,"length1":24,"length2":120}]],"length":710,"saved":false}
{"ts":1362406329984,"patch":[[{"diffs":[[0," src=\".."],[-1,"/dojo"],[1,"public/js"],[0,"/dojo.js"]],"start1":360,"start2":360,"length1":21,"length2":25}]],"length":714,"saved":false}
{"ts":1362406339093,"patch":[[{"diffs":[[0," src=\".."],[1,"/"],[0,"public/j"]],"start1":360,"start2":360,"length1":16,"length2":17}]],"length":715,"saved":false}
{"ts":1362406581991,"patch":[[{"diffs":[[0,".3/dojo/dojo.js\""],[1," data-dojo-config=\"async: true\""],[0,"></script -->\r\n "]],"start1":314,"start2":314,"length1":32,"length2":63}]],"length":746,"saved":false}
{"ts":1362406592609,"patch":[[{"diffs":[[0,"t -->\r\n <"],[1,"!-- "],[0,"script src=\"../p"]],"start1":369,"start2":369,"length1":32,"length2":36},{"diffs":[[0,"ue\"></script"],[1," --"],[0,">\r\n <"]],"start1":463,"start2":463,"length1":24,"length2":27}]],"length":753,"saved":false}
{"ts":1362406602754,"patch":[[{"diffs":[[0," 9-->\r\n <"],[-1,"!-- "],[0,"script src=\"//aj"]],"start1":242,"start2":242,"length1":36,"length2":32},{"diffs":[[0,": true\"></script"],[-1," --"],[0,">\r\n <!-- "]],"start1":350,"start2":350,"length1":35,"length2":32}]],"length":746,"saved":false}
{"ts":1362406623381,"patch":[[{"diffs":[[0," 9-->\r\n <"],[1,"!-- "],[0,"script src=\"//aj"]],"start1":242,"start2":242,"length1":32,"length2":36},{"diffs":[[0,"ue\"></script"],[1," --"],[0,">\r\n <"]],"start1":358,"start2":358,"length1":24,"length2":27},{"diffs":[[0,"t -->\r\n <"],[-1,"!-- "],[0,"script src=\"../p"]],"start1":369,"start2":369,"length1":36,"length2":32},{"diffs":[[0,": true\"></script"],[-1," --"],[0,">\r\n <scri"]],"start1":455,"start2":455,"length1":35,"length2":32}]],"length":746,"saved":false}
{"ts":1362406740478,"patch":[[{"diffs":[[0,"Dojo</div>\r\n"],[1," <p class=\"someNode\">Some node</p>\r\n"],[0," </body>\r"]],"start1":714,"start2":714,"length1":24,"length2":67}]],"length":789,"saved":false}
{"ts":1362406792407,"patch":[[{"diffs":[[0,"t -->\r\n <"],[1,"!-- "],[0,"script src=\"../p"]],"start1":369,"start2":369,"length1":32,"length2":36},{"diffs":[[0,"ue\"></script"],[1," --"],[0,">\r\n <"]],"start1":463,"start2":463,"length1":24,"length2":27}]],"length":796,"saved":false}
{"ts":1362406801613,"patch":[[{"diffs":[[0," 9-->\r\n <"],[-1,"!-- "],[0,"script src=\"//aj"]],"start1":242,"start2":242,"length1":36,"length2":32},{"diffs":[[0,": true\"></script"],[-1," --"],[0,">\r\n <!-- "]],"start1":350,"start2":350,"length1":35,"length2":32}]],"length":789,"saved":false}
{"ts":1362406826091,"patch":[[{"diffs":[[0," <p "],[-1,"class"],[1,"id"],[0,"=\"someNo"]],"start1":729,"start2":729,"length1":21,"length2":18}]],"length":786,"saved":false}
{"ts":1362406942548,"patch":[[{"diffs":[[0,"e node</p>\r\n"],[1," <h1 id=\"greeting\">Welcome</h1>\r\n"],[0," </body>\r"]],"start1":754,"start2":754,"length1":24,"length2":64}]],"length":826,"saved":false}
1 change: 1 addition & 0 deletions .c9revisions/StoyanCheresharov/exp_dojo_bg.html.c9save
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"ts":1362405648718,"silentsave":true,"restoring":false,"patch":[[{"diffs":[[1,"<!DOCTYPE html>\r\n<html>\r\n <head>\r\n <title>Exp BG</title>\r\n <link rel=\"stylesheet\" href=\"css/exp_bg.css\" type=\"text/css\" medea=\"screen\" title=\"exp_bg\" />\r\n <script src=\"js/dojo.js\" type=\"text/javascript\"></script>\r\n </head>\r\n <body>\r\n <h1>Exp BG</h1>\r\n <div id=\"myDiv\">Test</div>\r\n <script src=\"js/exp_dojo_bg.js\" type=\"text/javascript\"></script>\r\n </body>\r\n</html>"]],"start1":0,"start2":0,"length1":0,"length2":418}]],"length":418}
3 changes: 3 additions & 0 deletions .c9revisions/StoyanCheresharov/exp_jquery.html.c9save
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{"ts":1362400029066,"silentsave":true,"restoring":false,"patch":[[{"diffs":[[1,"<!DOCTYPE html>\n<html>\n <head>\n <title>Experiment page for jQuery</title>\n <link rel=\"stylesheet\" href=\"css/exp_jquery.css\" type=\"text/css\" medea=\"screen\" title=\"exp_jquery\" />\n <!-- script src=\"http://code.jquery.com/jquery-1.9.1.min.js\"></script -->\n <!-- script src=\"http://code.jquery.com/jquery-migrate-1.1.1.min.js\"></script --> \n <script src=\"../public/js/jquery-1.9.1.min.js\" type=\"text/javascript\"></script>\n <script src=\"js/exp_jquery.js\" type=\"text/javascript\"></script>\n </head>\n <body>\n <h1>Exp for jQuery</h1>\n <div>This is a div element</div>\n </body>\n</html>"]],"start1":0,"start2":0,"length1":0,"length2":649}]],"length":649}
{"contributors":[],"silentsave":false,"ts":1362400276623,"patch":[[{"diffs":[[0,"t</div>\n"],[1," <p class=\"\"></p>\n"],[0," </bo"]],"start1":622,"start2":622,"length1":16,"length2":41}]],"length":674,"saved":false}
{"ts":1362400285977,"patch":[[{"diffs":[[0," class=\""],[-1,"\">"],[1,"details\">I am a detail"],[0,"</p>\n "]],"start1":640,"start2":640,"length1":18,"length2":38}]],"length":694,"saved":false}
8 changes: 8 additions & 0 deletions .c9revisions/StoyanCheresharov/exp_jquery_bg.html.c9save
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{"ts":1362125618430,"silentsave":true,"restoring":false,"patch":[[]],"length":0}
{"contributors":[],"silentsave":false,"ts":1362125644549,"patch":[[{"diffs":[[1,"<!DOCTYPE html>\r\n<html>\r\n <head>\r\n <title>Exp BG</title>\r\n <link rel=\"stylesheet\" href=\"css/exp_bg.css\" type=\"text/css\" medea=\"screen\" title=\"exp_bg\" />\r\n <script type=\"text/javascript\" src=\"js/exp_bg.js\"></script>\r\n <!-- script type=\"text/javascript\" src=\"js/exp2_bg.js\"></script -->\r\n </head>\r\n <body>\r\n <h1>Exp BG</h1>\r\n <div id=\"myDiv\">Test</div>\r\n </body>\r\n</html>"]],"start1":0,"start2":0,"length1":0,"length2":423}]],"length":423,"saved":false}
{"ts":1362125784272,"patch":[[{"diffs":[[0,"ipt "],[-1,"type=\"text/javascript\" src=\"js/exp_bg"],[1,"src=\"http://code.jquery.com/jquery-1.9.1.min"],[0,".js\""]],"start1":183,"start2":183,"length1":45,"length2":52},{"diffs":[[0," <"],[-1,"!-- "],[0,"script "],[-1,"type=\"text/javascript\" src=\"js/exp2_bg"],[1,"src=\"http://code.jquery.com/jquery-migrate-1.1.1.min"],[0,".js\""]],"start1":252,"start2":252,"length1":57,"length2":67},{"diffs":[[0,"ript"],[-1," -->"],[1,"> "],[0,"\r\n "]],"start1":324,"start2":324,"length1":12,"length2":17}]],"length":445,"saved":false}
{"contributors":[],"silentsave":false,"ts":1362125862869,"patch":[[{"diffs":[[0,"script> "],[1,"\r\n"],[0," "],[1," <sript src=\"exp_jquery_bg.js\" type=\"text/javascript\"></sript>"],[0,"\r\n </"]],"start1":322,"start2":322,"length1":23,"length2":87}]],"length":509,"saved":false}
{"ts":1362125875633,"patch":[[{"diffs":[[0," <s"],[1,"c"],[0,"ript src"]],"start1":334,"start2":334,"length1":16,"length2":17}]],"length":510,"saved":false}
{"ts":1362125885138,"patch":[[{"diffs":[[0,"ipt\"></s"],[1,"c"],[0,"ript>\r\n "]],"start1":389,"start2":389,"length1":16,"length2":17}]],"length":511,"saved":false}
{"ts":1362126284433,"patch":[[{"diffs":[[0,"pt src=\""],[1,"ja/"],[0,"exp_jque"]],"start1":345,"start2":345,"length1":16,"length2":19}]],"length":514,"saved":false}
{"ts":1362126295848,"patch":[[{"diffs":[[0,"t src=\"j"],[-1,"a"],[1,"s"],[0,"/exp_jqu"]],"start1":346,"start2":346,"length1":17,"length2":17}]],"length":514,"saved":false}
8 changes: 8 additions & 0 deletions .c9revisions/StoyanCheresharov/js/exp2_bg.js.c9save
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{"ts":1362124892552,"silentsave":true,"restoring":false,"patch":[[]],"length":0}
{"contributors":[],"silentsave":false,"ts":1362124944014,"patch":[[{"diffs":[[1,"stoyan = 'Ivanov';"]],"start1":0,"start2":0,"length1":0,"length2":18}]],"length":18,"saved":false}
{"ts":1362124964188,"patch":[[{"diffs":[[0,"Ivanov';"],[1,"\n\nalert(stoyan);"]],"start1":10,"start2":10,"length1":8,"length2":24}]],"length":34,"saved":false}
{"ts":1362124975640,"patch":[[{"diffs":[[1,"var "],[0,"stoyan = 'Iv"]],"start1":0,"start2":0,"length1":12,"length2":16}]],"length":38,"saved":false}
{"ts":1362125105929,"patch":[[{"diffs":[[0,"stoyan);"],[1,"\n\nfunction test(){\n var stoyan = 'foo';\n alert(stoyan);\n}\n\n"]],"start1":30,"start2":30,"length1":8,"length2":73}]],"length":103,"saved":false}
{"ts":1362125126011,"patch":[[{"diffs":[[0,"an);\n}\n\n"],[1,"test();"]],"start1":95,"start2":95,"length1":8,"length2":15}]],"length":110,"saved":false}
{"ts":1362125157791,"patch":[[{"diffs":[[0,"(){\n "],[-1,"var "],[0,"stoyan ="]],"start1":53,"start2":53,"length1":20,"length2":16},{"diffs":[[0,"\ntest();"],[1,"\n\nalert(stoyan);"]],"start1":98,"start2":98,"length1":8,"length2":24}]],"length":122,"saved":false}
{"ts":1362125271053,"patch":[[{"diffs":[[0,"(){\n "],[1,"var "],[0,"stoyan ="]],"start1":53,"start2":53,"length1":16,"length2":20},{"diffs":[[0," = 'foo'"],[1,", dsds=null"],[0,";\n al"]],"start1":71,"start2":71,"length1":16,"length2":27},{"diffs":[[0,"toyan);\n"],[1," \n \n"],[0,"}\n\ntest("]],"start1":103,"start2":103,"length1":16,"length2":26}]],"length":147,"saved":false}
1 change: 1 addition & 0 deletions .c9revisions/StoyanCheresharov/js/exp_bg.js.c9save
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,4 @@
{"ts":1361528723814,"patch":[[{"diffs":[[0,"div');\n \n "],[-1,"var "],[0,"element = nodeLi"]],"start1":3432,"start2":3432,"length1":36,"length2":32}]],"length":3852,"saved":false}
{"ts":1361528739610,"patch":[[{"diffs":[[0,");\n \n "],[1,"var "],[0,"element = no"]],"start1":3436,"start2":3436,"length1":24,"length2":28}]],"length":3856,"saved":false}
{"ts":1361528838752,"patch":[[{"diffs":[[0," }; \n"],[1,"\n"],[0," "],[1," // 3.3 check which DOM 0, 1, 2 is suported\n if (element.addEventListener)\n { // all aothers\n element.addEventListener('mouseover', onMouseOver, false); // capture or not\n }\n else if (element.attachEvent)\n { // MS\n element.attachEvent('onmouseover', onMouseOver);\n }\n else\n { // DOM 0\n element.onmouseover = onMouseOver;\n }\n"],[0,"\n \n};\n\n"]],"start1":3838,"start2":3838,"length1":18,"length2":392}]],"length":4230,"saved":false}
{"contributors":[],"silentsave":false,"ts":1362124825047,"patch":[[{"diffs":[[0," }\n"],[-1,"\n \n};\n"],[1,"};\n\nvar stoyan = 'Cheresharov';\n\nalert(stoyan);"],[0,"\n"]],"start1":4218,"start2":4218,"length1":12,"length2":52}]],"length":4270,"saved":false}
6 changes: 6 additions & 0 deletions .c9revisions/StoyanCheresharov/js/exp_dojo.js.c9save
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{"ts":1362405883203,"silentsave":true,"restoring":false,"patch":[[]],"length":0}
{"contributors":[],"silentsave":false,"ts":1362405901397,"patch":[[{"diffs":[[1,"alert('I should do somethign with dojo');"]],"start1":0,"start2":0,"length1":0,"length2":41}]],"length":41,"saved":false}
{"ts":1362405907125,"patch":[[{"diffs":[[0,"ethi"],[1,"b"],[0,"g"],[-1,"n"],[0," wit"]],"start1":22,"start2":22,"length1":10,"length2":10}]],"length":41,"saved":false}
{"ts":1362405999892,"patch":[[{"diffs":[[-1,"alert('I should do somethibg with dojo'"],[1,"require([\"dojo/dom\", \"dojo/domReady!\"], function(dom){\r\n dom.byId(\"myDiv\").innerHTML = \"Hello New World!\";\r\n}"],[0,");"]],"start1":0,"start2":0,"length1":41,"length2":114}]],"length":114,"saved":false}
{"ts":1362406748408,"patch":[[{"diffs":[[0,"!\";\r\n});"],[1,"\r\n\r\nrequire([\"dojo/dom\", \"dojo/string\", \"dojo/domReady!\"], function(dom, string){\r\n dom.byId(\"someNode\").innerHTML = string.trim(\" I Like Trim Strings \");\r\n});"]],"start1":106,"start2":106,"length1":8,"length2":169}]],"length":275,"saved":false}
{"ts":1362406908544,"patch":[[{"diffs":[[0,"ngs \");\r\n});"],[1,"\r\n\r\nrequire([\"dojo/dom\", \"dojo/fx\", \"dojo/domReady!\"], function(dom, fx){\r\n // The piece we had before...\r\n var greeting = dom.byId(\"greeting\");\r\n greeting.innerHTML += \" from Dojo!\";\r\n // ...but now, with an animation!\r\n fx.slideTo({\r\n top: 100,\r\n left: 200,\r\n node: greeting\r\n }).play();\r\n});"]],"start1":263,"start2":263,"length1":12,"length2":342}]],"length":605,"saved":false}
1 change: 1 addition & 0 deletions .c9revisions/StoyanCheresharov/js/exp_dojo_bg.js.c9save
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"ts":1362405919289,"silentsave":true,"restoring":false,"patch":[[{"diffs":[[1,"require([\"dojo/dom\", \"dojo/domReady!\"], function(dom){\r\n dom.byId(\"myDiv\").innerHTML = \"Hello New World!\";\r\n});"]],"start1":0,"start2":0,"length1":0,"length2":114}]],"length":114}
Loading

0 comments on commit 54fc03d

Please sign in to comment.