summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-07-17 14:50:44 -0400
committerJulie Lala <jules@okfoc.us>2014-07-17 14:50:44 -0400
commitb1e172be9e8268532610b3e7fe2a4e339eccd1a2 (patch)
tree02f12e006aefbec5f492556586493db40af6b760
parent93ad35155739e90bec31769733b3dcfe741b93d9 (diff)
spinning projects on home view
-rw-r--r--public/assets/javascripts/ui/_router.js8
-rw-r--r--public/assets/javascripts/ui/lib/Router.js8
-rw-r--r--public/assets/javascripts/ui/site/HomeView.js11
-rw-r--r--public/assets/javascripts/ui/site/ProfileView.js13
-rw-r--r--public/assets/javascripts/ui/site/ProjectList.js28
-rw-r--r--views/partials/scripts.ejs3
-rw-r--r--views/projects/list-projects.ejs2
7 files changed, 58 insertions, 15 deletions
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index d070d55..4ff3581 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -17,6 +17,7 @@ var SiteRouter = Router.extend({
},
routes: {
+ "/": 'home',
"/login": 'signin',
"/signup": 'signup',
@@ -58,7 +59,6 @@ var SiteRouter = Router.extend({
$("body").removeClass("loading")
},
-
layoutEditor: function(e, name){
app.mode.builder = true
app.launch()
@@ -157,6 +157,12 @@ var SiteRouter = Router.extend({
this.passwordResetModal.load()
},
+
+ home: function(){
+ this.homeView = new HomeView ()
+ this.homeView.load()
+ },
+
profile: function(e){
this.profileView.load()
},
diff --git a/public/assets/javascripts/ui/lib/Router.js b/public/assets/javascripts/ui/lib/Router.js
index d27654a..5877f93 100644
--- a/public/assets/javascripts/ui/lib/Router.js
+++ b/public/assets/javascripts/ui/lib/Router.js
@@ -4,13 +4,19 @@ var Router = View.extend({
this.originalPath = window.location.pathname
- var path = window.location.pathname.split("/")
+ var pathname = window.location.pathname,
+ path = pathname.split("/");
+
for (var i = 0; i < path.length; i++) {
if (! path[i].length) {
path[i] = null
}
}
+ if (pathname in this.routes) {
+ this[this.routes[pathname]](null)
+ }
+
if (path[path.length-1] == null) {
path.pop()
}
diff --git a/public/assets/javascripts/ui/site/HomeView.js b/public/assets/javascripts/ui/site/HomeView.js
new file mode 100644
index 0000000..02f9ab9
--- /dev/null
+++ b/public/assets/javascripts/ui/site/HomeView.js
@@ -0,0 +1,11 @@
+
+var HomeView = View.extend({
+
+ initialize: function() {
+ },
+
+ load: function() {
+ this.projectList = new ProjectList ()
+ }
+
+})
diff --git a/public/assets/javascripts/ui/site/ProfileView.js b/public/assets/javascripts/ui/site/ProfileView.js
index 8661bcd..f3b35d9 100644
--- a/public/assets/javascripts/ui/site/ProfileView.js
+++ b/public/assets/javascripts/ui/site/ProfileView.js
@@ -11,18 +11,7 @@ var ProfileView = View.extend({
'thirteen'];
$(".bio").addClass(choice(classes));
- $("td.border").each(function() {
- var iframe = $(this).find("iframe").get('0')
- if (! iframe) return
- $(this).on({
- mouseenter: function(e){
- iframe.contentWindow.postMessage("spin-on", window.location.origin)
- },
- mouseleave: function(e){
- iframe.contentWindow.postMessage("spin-off", window.location.origin)
- }
- })
- })
+ this.projectList = new ProjectList ()
}
})
diff --git a/public/assets/javascripts/ui/site/ProjectList.js b/public/assets/javascripts/ui/site/ProjectList.js
new file mode 100644
index 0000000..b72c832
--- /dev/null
+++ b/public/assets/javascripts/ui/site/ProjectList.js
@@ -0,0 +1,28 @@
+
+var ProjectList = View.extend({
+
+ el: "#projectList",
+
+ events: {
+ "mouseenter td.border": 'spinOn',
+ "mouseleave td.border": 'spinOff',
+ },
+
+ initialize: function(){
+console.log("PISS")
+ },
+
+ spinOn: function(e){
+ var iframe = $(e.currentTarget).find("iframe").get('0')
+ if (! iframe) return
+ iframe.contentWindow.postMessage("spin-on", window.location.origin)
+ },
+
+ spinOff: function(e){
+ var iframe = $(e.currentTarget).find("iframe").get('0')
+ if (! iframe) return
+ iframe.contentWindow.postMessage("spin-off", window.location.origin)
+ }
+
+})
+
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 2173cd5..0dea452 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -70,7 +70,10 @@
<script type="text/javascript" src="/assets/javascripts/ui/site/EditProjectModal.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/site/EditProfileModal.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/site/DocumentModal.js"></script>
+
+<script type="text/javascript" src="/assets/javascripts/ui/site/HomeView.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/site/ProfileView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/site/ProjectList.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderView.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderSettings.js"></script>
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index af0d5bd..d2c0447 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -1,6 +1,6 @@
[[ if (projects.length) { ]]
- <table>
+ <table id="projectList">
<tr>
[[ projects.forEach(function(project, i) { ]]