Skip to content

Commit 9b81a25

Browse files
addyosmaniaddyosmani
committed
Dropping the non Marionette module variation of the application, updating index, adding readme.
1 parent db6e8e7 commit 9b81a25

22 files changed

+82
-3316
lines changed

‎index.html

-3
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,6 @@ <h2>Labs</h2>
235235
<li>
236236
<a href="labs/architecture-examples/backbone_marionette" data-source="http://marionettejs.com" data-content="Backbone.Marionette is a composite application library for Backbone.js that aims to simplify the construction of large scale JavaScript applications.">MarionetteJS</a>
237237
</li>
238-
<li>
239-
<a href="labs/architecture-examples/backbone_marionette_modules" data-source="http://marionettejs.com" data-content="Backbone.Marionette is a composite application library for Backbone.js that aims to simplify the construction of large scale JavaScript applications.">MarionetteJS (modules)</a>
240-
</li>
241238
<li>
242239
<a href="labs/architecture-examples/thorax" data-source="https://github.com/walmartlabs/thorax" data-content="Thorax is a Backbone superset that integrates deeply with Handlebars to provide easy model and collection binding.">Thorax</a>
243240
</li>

‎labs/architecture-examples/backbone_marionette/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Backbone.Marionette is a composite application library for Backbone.js that aims to simplify the construction of large scale JavaScript applications. It is a collection of common design and implementation patterns found in the applications that Derick Bailey has been building with Backbone, and includes various pieces inspired by composite application architectures, such as Microsoft's "Prism" framework.
2+
3+
This implementation of the application uses Marionette's module system. Variations using RequireJS and a more classic approach to JavaScript modules are also [available](https://github.com/marionettejs/backbone.marionette/wiki/Projects-and-websites-using-marionette).

‎labs/architecture-examples/backbone_marionette/index.html

+79-71
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,91 @@
11
<!doctype html>
22
<html lang="en">
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6-
<title>Marionette • TodoMVC</title>
7-
<link rel="stylesheet" href="../../../assets/base.css">
8-
<link rel="stylesheet" href="css/app.css">
9-
<!--[if IE]>
10-
<script src="../../../assets/ie.js"></script>
11-
<![endif]-->
12-
</head>
13-
<body>
14-
<section id="todoapp">
15-
<header id="header"></header>
16-
<section id="main"></section>
17-
<footer id="footer"></footer>
18-
</section>
19-
<footer id="info">
20-
<p>Double-click to edit a todo</p>
213

22-
<p>Created by <a href="http://github.com/jsoverson">Jarrod Overson</a></p>
23-
</footer>
4+
<head>
5+
<meta charset="utf-8">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
7+
<title>Marionette • TodoMVC</title>
8+
<link rel="stylesheet" href="../../../assets/base.css">
9+
<link rel="stylesheet" href="css/app.css">
10+
<!--[if IE]>
11+
<script src="../../../assets/ie.js"></script>
12+
<![endif]-->
2413

25-
<!-- vendor libraries -->
26-
<script src="../../../assets/base.js"></script>
27-
<script src="../../../assets/jquery.min.js"></script>
28-
<script src="../../../assets/lodash.min.js"></script>
29-
<script src="js/lib/backbone.js"></script>
30-
<script src="js/lib/backbone-localStorage.js"></script>
31-
<script src="js/lib/backbone.marionette.js"></script>
14+
<script type="text/html" id="template-footer">
15+
<span id="todo-count"><strong></strong> items left</span>
16+
<ul id="filters">
17+
<li>
18+
<a href="#">All</a>
19+
</li>
20+
<li>
21+
<a href="#active">Active</a>
22+
</li>
23+
<li>
24+
<a href="#completed">Completed</a>
25+
</li>
26+
</ul>
27+
<button id="clear-completed">Clear completed</button>
28+
</script>
3229

33-
<!-- application libraries -->
34-
<script src="js/models/Todo.js"></script>
35-
<script src="js/collections/TodoList.js"></script>
36-
<script src="js/Router.js"></script>
30+
<script type="text/html" id="template-header">
31+
<h1>todos</h1>
32+
<input id="new-todo" placeholder="What needs to be done?" autofocus>
33+
</script>
3734

38-
<!-- application views -->
39-
<script src="js/views/Footer.js"></script>
40-
<script src="js/views/Header.js"></script>
41-
<script src="js/views/TodoItemView.js"></script>
42-
<script src="js/views/TodoListCompositeView.js"></script>
35+
<script type="text/html" id="template-todoItemView">
36+
<div class="view">
37+
<input class="toggle" type="checkbox" <% if (completed) { %>checked<% } %>>
38+
<label><%= title %></label>
39+
<button class="destroy"></button>
40+
</div>
41+
<input class="edit" value="<%= title %>">
42+
</script>
4343

44-
<!-- application -->
45-
<script src="js/app.js"></script>
44+
<script type="text/html" id="template-todoListCompositeView">
45+
<input id="toggle-all" type="checkbox">
46+
<label for="toggle-all">Mark all as complete</label>
47+
<ul id="todo-list"></ul>
48+
</script>
4649

47-
<script type="text/html" id="template-footer">
48-
<span id="todo-count"><strong></strong> items left</span>
49-
<ul id="filters">
50-
<li>
51-
<a href="#/">All</a>
52-
</li>
53-
<li>
54-
<a href="#/active">Active</a>
55-
</li>
56-
<li>
57-
<a href="#/completed">Completed</a>
58-
</li>
59-
</ul>
60-
<button id="clear-completed">Clear completed</button>
61-
</script>
50+
</head>
6251

63-
<script type="text/html" id="template-header">
64-
<h1>todos</h1>
65-
<input id="new-todo" placeholder="What needs to be done?" autofocus>
66-
</script>
52+
<body>
53+
<section id="todoapp">
54+
<header id="header"></header>
55+
<section id="main"></section>
56+
<footer id="footer"></footer>
57+
</section>
6758

68-
<script type="text/html" id="template-todoItemView">
69-
<div class="view">
70-
<input class="toggle" type="checkbox" <% if (completed) { %>checked<% } %>>
71-
<label><%= title %></label>
72-
<button class="destroy"></button>
73-
</div>
74-
<input class="edit" value="<%= title %>">
75-
</script>
59+
<footer id="info">
60+
<p>Double-click to edit a todo</p>
61+
<p>
62+
Created by <a href="http://github.com/jsoverson">Jarrod Overson</a>
63+
and <a href="http://github.com/derickbailey">Derick Bailey</a>,
64+
using <a href="http://marionettejs.com">Backbone.Marionette</a>
65+
</p>
66+
<p>Further variations on the Backbone.Marionette app are also <a href="https://github.com/marionettejs/backbone.marionette/wiki/Projects-and-websites-using-marionette">available</a>.</p>
67+
</footer>
7668

77-
<script type="text/html" id="template-todoListCompositeView">
78-
<input id="toggle-all" type="checkbox">
79-
<label for="toggle-all">Mark all as complete</label>
80-
<ul id="todo-list"></ul>
81-
</script>
82-
</body>
69+
<!-- vendor libraries -->
70+
<script src="../../../assets/base.js"></script>
71+
<script src="../../../assets/jquery.min.js"></script>
72+
<script src="../../../assets/lodash.min.js"></script>
73+
<script src="js/lib/backbone.js"></script>
74+
<script src="js/lib/backbone-localStorage.js"></script>
75+
<script src="js/lib/backbone.marionette.js"></script>
76+
77+
<!-- application -->
78+
<script src="js/TodoMVC.js"></script>
79+
<script src="js/TodoMVC.Todos.js"></script>
80+
<script src="js/TodoMVC.Layout.js"></script>
81+
<script src="js/TodoMVC.TodoList.Views.js"></script>
82+
<script src="js/TodoMVC.TodoList.js"></script>
83+
84+
<script>
85+
$(function(){
86+
// Start the TodoMVC app (defined in js/TodoMVC.js)
87+
TodoMVC.start();
88+
});
89+
</script>
90+
</body>
8391
</html>

‎labs/architecture-examples/backbone_marionette/js/Router.js

-11
This file was deleted.

‎labs/architecture-examples/backbone_marionette_modules/js/TodoMVC.Layout.js ‎labs/architecture-examples/backbone_marionette/js/TodoMVC.Layout.js

File renamed without changes.

‎labs/architecture-examples/backbone_marionette_modules/js/TodoMVC.TodoList.Views.js ‎labs/architecture-examples/backbone_marionette/js/TodoMVC.TodoList.Views.js

File renamed without changes.

‎labs/architecture-examples/backbone_marionette_modules/js/TodoMVC.TodoList.js ‎labs/architecture-examples/backbone_marionette/js/TodoMVC.TodoList.js

File renamed without changes.

‎labs/architecture-examples/backbone_marionette_modules/js/TodoMVC.Todos.js ‎labs/architecture-examples/backbone_marionette/js/TodoMVC.Todos.js

File renamed without changes.

‎labs/architecture-examples/backbone_marionette_modules/js/TodoMVC.js ‎labs/architecture-examples/backbone_marionette/js/TodoMVC.js

File renamed without changes.

‎labs/architecture-examples/backbone_marionette/js/app.js

-45
This file was deleted.

‎labs/architecture-examples/backbone_marionette/js/collections/TodoList.js

-19
This file was deleted.

‎labs/architecture-examples/backbone_marionette/js/models/Todo.js

-16
This file was deleted.

‎labs/architecture-examples/backbone_marionette/js/views/Footer.js

-28
This file was deleted.

‎labs/architecture-examples/backbone_marionette/js/views/Header.js

-21
This file was deleted.

‎labs/architecture-examples/backbone_marionette/js/views/TodoItemView.js

-49
This file was deleted.

0 commit comments

Comments
 (0)