0 Votes

Changes for page Todolist Macro

Last modified by Ryan C on 2025/04/30 07:54

From version 10.1
edited by Ryan C
on 2025/04/24 11:00
Change comment: There is no comment for this version
To version 27.1
edited by Ryan C
on 2025/04/24 11:25
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,7 +1,9 @@
1 1  Macro to display todo-lists using emberjs. This code is based on the emberjs demo. You can see an example below
2 2  
3 3  {{todolist width="50%" center="1"}}
4 -a thing|1
5 -a second thing|0
4 +a 3nd thing|0
5 +adding this thing|0
6 +adding this thing|0
7 +refreshed they are still there not even having to save page|0
6 6  
7 7  {{/todolist}}
XWiki.JavaScriptExtension[0]
Code
... ... @@ -1,8 +1,13 @@
1 1  requirejs.config({
2 2   baseUrl: '${xwiki.getDocument("TodoLists.TodoListMacro").getURL("download")}/',
3 3   paths: {
4 - 'jquery': 'https://code.jquery.com/jquery-1.10.2.min'
4 + // Use existing jQuery if available, otherwise load 1.10.2
5 + 'jquery': window.jQuery ? 'empty:' : 'https://code.jquery.com/jquery-1.10.2.min'
5 5   },
7 + map: {
8 + // Map any module requiring 'jquery' to use the global jQuery
9 + '*': { 'jquery': window.jQuery ? 'jquery-global' : 'jquery' }
10 + },
6 6   shim: {
7 7   'ember-data': {
8 8   deps: ['ember', 'jquery']
... ... @@ -13,241 +13,331 @@
13 13   }
14 14  });
15 15  
16 -require(['jquery', 'handlebars-v1.2.1', 'ember-data', 'ember' ], function ($) {
21 +// Define a module that returns the global jQuery
22 +define('jquery-global', [], function() {
23 + return window.jQuery;
24 +});
17 17  
18 -// create app
19 -window.Todos = Ember.Application.create({
20 - rootElement: '#todoappdiv'
26 +// Define empty module for when jQuery is already loaded
27 +define('empty:', [], function() {
28 + return window.jQuery;
21 21  });
22 22  
23 -// define the todolist store that will write to the TodoListsService
24 -Todos.ApplicationAdapter = DS.Adapter.extend({
25 - createRecord: function(store, type, record) {
26 - console.log("createRecord");
27 - var query = { create: "1", content : JSON.stringify(record) };
28 - return new Ember.RSVP.Promise(function(resolve, reject) {
29 - jQuery.getJSON("${xwiki.getURL("TodoLists.TodoListsService")}?page=" + XWiki.currentSpace + "." + XWiki.currentPage + "&xpage=plain&outputSyntax=plain", query).then(function(data) {
30 - Ember.run(null, resolve, data);
31 - }, function(jqXHR) {
32 - jqXHR.then = null; // tame jQuery's ill mannered promises
33 - Ember.run(null, reject, jqXHR);
34 - });
31 +require(['jquery', 'handlebars-v1.2.1', 'ember-data', 'ember'], function($) {
32 + // Check jQuery version compatibility with Ember
33 + var jQueryVersion = $.fn.jquery.split('.');
34 + var majorVersion = parseInt(jQueryVersion[0]);
35 + var minorVersion = parseInt(jQueryVersion[1]);
36 +
37 + console.log("Using jQuery version:", $.fn.jquery);
38 +
39 + // Verify jQuery version is compatible with Ember
40 + var isCompatible = (majorVersion === 1 && minorVersion >= 7 && minorVersion <= 10) ||
41 + (majorVersion === 2 && minorVersion === 0);
42 +
43 + if (!isCompatible) {
44 + console.error("Warning: Ember Views require jQuery 1.7, 1.8, 1.9, 1.10, or 2.0. Current version:", $.fn.jquery);
45 + // Try to load a compatible version if needed
46 + require(['https://code.jquery.com/jquery-1.10.2.min.js'], function(compatibleJQuery) {
47 + // Store the original jQuery
48 + var originalJQuery = window.jQuery;
49 + // Replace with compatible jQuery temporarily
50 + window.jQuery = compatibleJQuery;
51 + // Continue with the rest of the code
52 + initializeEmberApp(compatibleJQuery);
53 + // Restore original jQuery when done
54 + window.jQuery = originalJQuery;
35 35   });
36 - },
37 - deleteRecord: function(store, type, record) {
38 - console.log("deleteRecord");
39 - return this.saveAll(store.recordArrayManager.recordArraysForRecord(record).list[0].content);
40 - },
41 - find: function(store, type, id) {
42 - console.log("find");
43 - return;
44 - },
45 - findAll: function(store, type, sinceToken) {
46 - console.log("findAll");
47 - var query = { since: sinceToken };
48 - return new Ember.RSVP.Promise(function(resolve, reject) {
49 - jQuery.getJSON("${xwiki.getURL("TodoLists.TodoListsService")}?page=" + XWiki.currentSpace + "." + XWiki.currentPage + "&xpage=plain&outputSyntax=plain", query).then(function(data) {
50 - Ember.run(null, resolve, data);
51 - }, function(jqXHR) {
52 - jqXHR.then = null; // tame jQuery's ill mannered promises
53 - Ember.run(null, reject, jqXHR);
54 - });
55 - });
56 - },
57 - updateRecord: function(store, type, record) {
58 - return this.saveAll(store.recordArrayManager.recordArraysForRecord(record).list[0].content);
59 - },
60 - saveAll: function(alldata) {
61 - console.log("updateRecord");
62 - var query = { save: "1", content : JSON.stringify(alldata) };
63 - return new Ember.RSVP.Promise(function(resolve, reject) {
64 - jQuery.getJSON("${xwiki.getURL("TodoLists.TodoListsService")}?page=" + XWiki.currentSpace + "." + XWiki.currentPage + "&xpage=plain&outputSyntax=plain", query).then(function(data) {
65 - Ember.run(null, resolve, data);
66 - }, function(jqXHR) {
67 - jqXHR.then = null; // tame jQuery's ill mannered promises
68 - Ember.run(null, reject, jqXHR);
69 - });
70 - });
56 + } else {
57 + // jQuery version is compatible, proceed normally
58 + initializeEmberApp($);
71 71   }
72 -});
73 73  
74 -// use my own store
75 -Todos.store = DS.Store.create({
76 - adapter: 'ApplicationAdapter'
77 -});
61 + function initializeEmberApp($) {
62 + // Create app
63 + window.Todos = Ember.Application.create({
64 + rootElement: '#todoappdiv'
65 + });
78 78  
79 -// Todos.ApplicationAdapter = DS.FixtureAdapter.extend();
67 + // Define the todolist store that will write to the TodoListsService
68 + Todos.ApplicationAdapter = DS.Adapter.extend({
69 + namespace: 'api', // Moved inside the adapter definition
80 80  
81 -// routing
82 -Todos.Router.map(function() {
83 - this.resource('todos', { path: '' }, function() {
84 - this.route('active');
85 - this.route('completed');
86 - });
87 -});
71 + createRecord: function(store, type, record) {
72 + console.log("createRecord");
73 + var data = this.serialize(record, { includeId: true });
74 + var query = { create: "1", content: JSON.stringify(data) };
88 88  
89 -Todos.TodosRoute = Ember.Route.extend({
90 - model: function() {
91 - return this.store.find('todo');
92 - }
93 -});
76 + return new Ember.RSVP.Promise(function(resolve, reject) {
77 + var url = "${xwiki.getURL('TodoLists.TodoListsService')}?page=" +
78 + XWiki.currentSpace + "." + XWiki.currentPage +
79 + "&xpage=plain&outputSyntax=plain";
80 + console.log("Creating record, URL:", url);
94 94  
95 -Todos.TodosIndexRoute = Ember.Route.extend({
96 - model: function() {
97 - return this.modelFor('todos');
98 - }
99 -});
82 + jQuery.getJSON(url, query).then(function(data) {
83 + console.log("Create success:", data);
84 + Ember.run(function() {
85 + resolve(data);
86 + });
87 + }, function(jqXHR) {
88 + console.error("Create error:", jqXHR);
89 + Ember.run(function() {
90 + reject(jqXHR);
91 + });
92 + });
93 + });
94 + },
100 100  
101 -// ... additional lines truncated for brevity ...
102 -Todos.TodosActiveRoute = Ember.Route.extend({
103 - model: function(){
104 - return this.store.filter('todo', function(todo) {
105 - return !todo.get('isCompleted');
96 + deleteRecord: function(store, type, record) {
97 + console.log("deleteRecord");
98 + var recordArrays = store.recordArrayManager.recordArraysForRecord(record);
99 + if (recordArrays && recordArrays.list && recordArrays.list[0]) {
100 + return this.saveAll(recordArrays.list[0].content);
101 + }
102 + return Ember.RSVP.resolve();
103 + },
104 +
105 + find: function(store, type, id) {
106 + console.log("find");
107 + return Ember.RSVP.resolve();
108 + },
109 +
110 + findAll: function(store, type, sinceToken) {
111 + console.log("findAll");
112 + var query = { since: sinceToken };
113 +
114 + return new Ember.RSVP.Promise(function(resolve, reject) {
115 + var url = "${xwiki.getURL('TodoLists.TodoListsService')}?page=" +
116 + XWiki.currentSpace + "." + XWiki.currentPage +
117 + "&xpage=plain&outputSyntax=plain";
118 + console.log("Finding all records, URL:", url);
119 +
120 + jQuery.getJSON(url, query).then(function(data) {
121 + console.log("FindAll success:", data);
122 + Ember.run(function() {
123 + resolve(data);
124 + });
125 + }, function(jqXHR) {
126 + console.error("FindAll error:", jqXHR);
127 + Ember.run(function() {
128 + reject(jqXHR);
129 + });
130 + });
131 + });
132 + },
133 +
134 + updateRecord: function(store, type, record) {
135 + console.log("updateRecord");
136 + var recordArrays = store.recordArrayManager.recordArraysForRecord(record);
137 + if (recordArrays && recordArrays.list && recordArrays.list[0]) {
138 + return this.saveAll(recordArrays.list[0].content);
139 + }
140 + return Ember.RSVP.resolve();
141 + },
142 +
143 + saveAll: function(alldata) {
144 + console.log("saveAll");
145 + var query = { save: "1", content: JSON.stringify(alldata) };
146 +
147 + return new Ember.RSVP.Promise(function(resolve, reject) {
148 + var currentPage = XWiki.currentSpace + "." + XWiki.currentPage;
149 + var url = "${xwiki.getURL('TodoLists.TodoListsService')}?page=" +
150 + currentPage + "&xpage=plain&outputSyntax=plain";
151 + console.log("Saving all records, URL:", url, "Page:", currentPage);
152 +
153 + jQuery.getJSON(url, query).then(function(data) {
154 + console.log("SaveAll success:", data);
155 + Ember.run(function() {
156 + resolve(data);
157 + });
158 + }, function(jqXHR) {
159 + console.error("SaveAll error:", jqXHR);
160 + Ember.run(function() {
161 + reject(jqXHR);
162 + });
163 + });
164 + });
165 + }
106 106   });
107 - },
108 - renderTemplate: function(controller) {
109 - this.render('todos/index', {controller: controller});
110 - }
111 -});
112 112  
113 -Todos.TodosCompletedRoute = Ember.Route.extend({
114 - model: function(){
115 - return this.store.filter('todo', function (todo) {
116 - return todo.get('isCompleted');
168 + // Routing
169 + Todos.Router.map(function() {
170 + this.resource('todos', { path: '' }, function() {
171 + this.route('active');
172 + this.route('completed');
173 + });
117 117   });
118 - },
119 - renderTemplate: function(controller){
120 - this.render('todos/index', {controller: controller});
121 - }
122 -});
123 123  
124 -// data model
125 -Todos.Todo = DS.Model.extend({
126 - title: DS.attr('string'),
127 - priority: DS.attr('string'),
128 - assignee: DS.attr('string'),
129 - isCompleted: DS.attr('boolean')
130 -});
176 + Todos.TodosRoute = Ember.Route.extend({
177 + model: function() {
178 + return this.store.find('todo');
179 + }
180 + });
131 131  
132 -// ... additional lines truncated for brevity ...
133 -Todos.Todo.FIXTURES = [
134 - {
135 - id: 1,
136 - title: 'Learn Ember.js X',
137 - isCompleted: true
138 - },
139 - {
140 - id: 2,
141 - title: '...',
142 - isCompleted: false
143 - },
144 - {
145 - id: 3,
146 - title: 'Profit!',
147 - isCompleted: false
148 - }
149 -];
182 + Todos.TodosIndexRoute = Ember.Route.extend({
183 + model: function() {
184 + return this.modelFor('todos');
185 + }
186 + });
150 150  
151 -// controler
152 -Todos.TodoController = Ember.ObjectController.extend({
153 - actions: {
154 - editTodo: function () {
155 - this.set('isEditing', true);
156 - },
157 - acceptChanges: function() {
158 - this.set('isEditing', false);
188 + Todos.TodosActiveRoute = Ember.Route.extend({
189 + model: function() {
190 + return this.store.filter('todo', function(todo) {
191 + return !todo.get('isCompleted');
192 + });
193 + },
194 + renderTemplate: function(controller) {
195 + this.render('todos/index', { controller: controller });
196 + }
197 + });
159 159  
160 - if (Ember.isEmpty(this.get('model.title'))) {
161 - this.send('removeTodo');
162 - } else {
163 - this.get('model').save();
164 - }
165 - },
166 - removeTodo: function() {
167 - var todo = this.get('model');
168 - todo.deleteRecord();
169 - todo.save();
170 - }
171 - },
199 + Todos.TodosCompletedRoute = Ember.Route.extend({
200 + model: function() {
201 + return this.store.filter('todo', function(todo) {
202 + return todo.get('isCompleted');
203 + });
204 + },
205 + renderTemplate: function(controller) {
206 + this.render('todos/index', { controller: controller });
207 + }
208 + });
172 172  
173 - isEditing: false,
210 + // Data model
211 + Todos.Todo = DS.Model.extend({
212 + title: DS.attr('string'),
213 + priority: DS.attr('string'),
214 + assignee: DS.attr('string'),
215 + isCompleted: DS.attr('boolean')
216 + });
174 174  
175 - isCompleted: function(key, value){
176 - var model = this.get('model');
218 + // Controller
219 + Todos.TodoController = Ember.ObjectController.extend({
220 + actions: {
221 + editTodo: function() {
222 + this.set('isEditing', true);
223 + },
224 + acceptChanges: function() {
225 + this.set('isEditing', false);
177 177  
178 - if (value === undefined) {
179 - // property being used as a getter
180 - return model.get('isCompleted');
181 - } else {
182 - // property being used as setter
183 - model.set('isCompleted', value);
184 - model.save();
185 - return value;
186 - }
187 - }.property('model.isCompleted')
188 -});
227 + if (Ember.isEmpty(this.get('model.title'))) {
228 + this.send('removeTodo');
229 + } else {
230 + this.get('model').save();
231 + }
232 + },
233 + removeTodo: function() {
234 + var todo = this.get('model');
235 + todo.deleteRecord();
236 + todo.save();
237 + }
238 + },
189 189  
190 -Todos.TodosController = Ember.ArrayController.extend({
191 - actions: {
192 - createTodo: function () {
193 - // Get the todo title set by the "New Todo" text field
194 - var title = this.get('newTitle');
195 - if (!title.trim()) { return; }
240 + isEditing: false,
196 196  
197 - // Create the new Todo model
198 - var todo = this.store.createRecord('todo', {
199 - title: title,
200 - priority: "P3",
201 - assignee: "all",
202 - isCompleted: false
203 - });
242 + isCompleted: function(key, value) {
243 + var model = this.get('model');
204 204  
205 - // Clear the "New Todo" text field
206 - this.set('newTitle', '');
245 + if (value === undefined) {
246 + // Property being used as a getter
247 + return model.get('isCompleted');
248 + } else {
249 + // Property being used as setter
250 + model.set('isCompleted', value);
251 + model.save();
252 + return value;
253 + }
254 + }.property('model.isCompleted')
255 + });
207 207  
208 - // Save the new model
209 - todo.save();
210 - },
211 - clearCompleted: function () {
212 - var completed = this.filterProperty('isCompleted', true);
213 - completed.invoke('deleteRecord');
214 - completed.invoke('save');
215 - }
216 - },
257 + Todos.TodosController = Ember.ArrayController.extend({
258 + actions: {
259 + createTodo: function() {
260 + // Get the todo title set by the "New Todo" text field
261 + var title = this.get('newTitle');
262 + if (!title || !title.trim()) { return; }
217 217  
218 - remaining: function () {
219 - return this.filterProperty('isCompleted', false).get('length');
220 - }.property('@each.isCompleted'),
264 + console.log("Creating new todo with title:", title);
221 221  
222 - inflection: function () {
223 - var remaining = this.get('remaining');
224 - return remaining === 1 ? 'item' : 'items';
225 - }.property('remaining'),
226 - hasCompleted: function () {
227 - return this.get('completed') > 0;
228 - }.property('completed'),
266 + // Create the new Todo model
267 + var todo = this.store.createRecord('todo', {
268 + title: title,
269 + priority: "P3",
270 + assignee: "all",
271 + isCompleted: false
272 + });
229 229  
230 - completed: function () {
231 - return this.filterProperty('isCompleted', true).get('length');
232 - }.property('@each.isCompleted'),
274 + // Clear the "New Todo" text field
275 + this.set('newTitle', '');
233 233  
234 - allAreDone: function(key, value) {
235 - if (value === undefined) {
236 - return !!this.get('length') && this.everyProperty('isCompleted', true);
237 - } else {
238 - this.setEach('isCompleted', value);
239 - this.invoke('save');
240 - return value;
241 - }
242 -}.property('@each.isCompleted')
243 -});
277 + // Save the new model
278 + todo.save().then(function(savedTodo) {
279 + console.log("Todo saved successfully:", savedTodo);
280 + // Force a refresh of the list after saving
281 + Ember.run.later(function() {
282 + console.log("Refreshing todo list");
283 + Todos.store.find('todo');
284 + }, 100);
285 + }, function(error) {
286 + console.error("Failed to save todo:", error);
287 + });
288 + },
244 244  
245 -// editing
246 -Todos.EditTodoView = Ember.TextField.extend({
247 - didInsertElement: function() {
248 - this.$().focus();
290 + clearCompleted: function() {
291 + var completed = this.filter(function(todo) {
292 + return todo.get('isCompleted');
293 + });
294 +
295 + completed.forEach(function(todo) {
296 + todo.deleteRecord();
297 + todo.save();
298 + });
299 + }
300 + },
301 +
302 + remaining: function() {
303 + return this.filter(function(todo) {
304 + return !todo.get('isCompleted');
305 + }).get('length');
306 + }.property('@each.isCompleted'),
307 +
308 + inflection: function() {
309 + var remaining = this.get('remaining');
310 + return remaining === 1 ? 'item' : 'items';
311 + }.property('remaining'),
312 +
313 + hasCompleted: function() {
314 + return this.get('completed') > 0;
315 + }.property('completed'),
316 +
317 + completed: function() {
318 + return this.filter(function(todo) {
319 + return todo.get('isCompleted');
320 + }).get('length');
321 + }.property('@each.isCompleted'),
322 +
323 + allAreDone: function(key, value) {
324 + if (value === undefined) {
325 + return this.get('length') > 0 && this.every(function(todo) {
326 + return todo.get('isCompleted');
327 + });
328 + } else {
329 + this.forEach(function(todo) {
330 + todo.set('isCompleted', value);
331 + todo.save();
332 + });
333 + return value;
334 + }
335 + }.property('@each.isCompleted')
336 + });
337 +
338 + // Editing
339 + Todos.EditTodoView = Ember.TextField.extend({
340 + didInsertElement: function() {
341 + this.$().focus();
342 + }
343 + });
344 +
345 + Ember.Handlebars.helper('edit-todo', Todos.EditTodoView);
249 249   }
250 250  });
251 251  
252 -Ember.Handlebars.helper('edit-todo', Todos.EditTodoView);
253 -});