From 6a15ef3108a32c0e90f2bfb60337a4eea5206238 Mon Sep 17 00:00:00 2001 From: Alexander Babich Date: Fri, 11 Dec 2015 16:15:12 +0200 Subject: [PATCH 01/14] Create README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..e3e1614 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +#Some related links: +* [Online demo by code author] (http://desktop.sonspring.com/) +* [Making the jQuery Desktop] (http://sonspring.com/journal/jquery-desktop) +* [Leopard Desktop with jQDock] (http://code.tutsplus.com/tutorials/leopard-desktop-with-jquery-using-jqdock--net-860) + From ca9f4db08ab791d3ec4efd180dfe7f3d03068b12 Mon Sep 17 00:00:00 2001 From: Alexander Babich Date: Fri, 11 Dec 2015 16:20:34 +0200 Subject: [PATCH 02/14] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e3e1614..5a45e15 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -#Some related links: +#jQuery Desktop by [Nathan Smith] (https://github.com/nathansmith) +--- + +##Some related links: * [Online demo by code author] (http://desktop.sonspring.com/) * [Making the jQuery Desktop] (http://sonspring.com/journal/jquery-desktop) * [Leopard Desktop with jQDock] (http://code.tutsplus.com/tutorials/leopard-desktop-with-jquery-using-jqdock--net-860) From d7b1555cb480acb751d33a68a193b91fc147bc83 Mon Sep 17 00:00:00 2001 From: Alexander Babich Date: Fri, 11 Dec 2015 16:20:52 +0200 Subject: [PATCH 03/14] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 5a45e15..291effb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ #jQuery Desktop by [Nathan Smith] (https://github.com/nathansmith) ---- ##Some related links: * [Online demo by code author] (http://desktop.sonspring.com/) From d90880b045a6ded14afcd0f8b11b52a5e0f13b94 Mon Sep 17 00:00:00 2001 From: Taurus Date: Fri, 11 Dec 2015 20:59:44 +0200 Subject: [PATCH 04/14] Merge origin/master Conflicts: _posts/2015-11-21-starting-with-GitHub-pages.md --- .gitignore | 3 ++- assets/js/jquery.desktop.js | 1 + index.html | 4 +++- nbproject/project.properties | 3 +++ nbproject/project.xml | 9 +++++++++ 5 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 nbproject/project.properties create mode 100644 nbproject/project.xml diff --git a/.gitignore b/.gitignore index 496ee2c..e63f4fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.DS_Store \ No newline at end of file +.DS_Store +/nbproject/private/ \ No newline at end of file diff --git a/assets/js/jquery.desktop.js b/assets/js/jquery.desktop.js index 2d73cdd..d050907 100755 --- a/assets/js/jquery.desktop.js +++ b/assets/js/jquery.desktop.js @@ -20,6 +20,7 @@ var JQD = (function($, window, document, undefined) { // clock: function() { var clock = $('#clock'); + if (!clock.length) { return; diff --git a/index.html b/index.html index e20ad80..1602097 100755 --- a/index.html +++ b/index.html @@ -4,6 +4,8 @@ + + jQuery Desktop