Changes for page Todolist Macro

Summary

• Objects (1 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -1,295 +1,333 @@
1	1	requirejs.config({
2	2	baseUrl: '${xwiki.getDocument("TodoLists.TodoListMacro").getURL("download")}/',
3	3	paths: {
4		- 'jquery': 'https://code.jquery.com/jquery-3.6.0.min' // Updated jQuery version
	4	+ 'jquery-1.10.2': 'https://code.jquery.com/jquery-1.10.2.min'
5	5	},
6	6	shim: {
7	7	'ember-data': {
8		- deps: ['ember', 'jquery']
	8	+ deps: ['ember']
9	9	},
10	10	'ember': {
11		- deps: ['jquery']
	11	+ deps: ['jquery-1.10.2']
12	12	}
13	13	}
14	14	});
15	15
16		-require(['jquery', 'handlebars-v1.2.1', 'ember-data', 'ember'], function($) {
17		- // Create app
18		- window.Todos = Ember.Application.create({
19		- rootElement: '#todoappdiv'
	16	+// Load jQuery 1.10.2 specifically for Ember, using noConflict mode
	17	+require(['jquery-1.10.2'], function(jQuery) {
	18	+ // Store the original jQuery and $ if they exist
	19	+ var originalJQuery = window.jQuery;
	20	+ var original$ = window.$;
	21	+
	22	+ // Create a new jQuery instance in noConflict mode
	23	+ var emberJQuery = jQuery.noConflict(true);
	24	+
	25	+ // Now load Ember with our specific jQuery
	26	+ require(['handlebars-v1.2.1', 'ember-data', 'ember'], function() {
	27	+ // Make emberJQuery available to Ember
	28	+ window.jQuery = emberJQuery;
	29	+ window.$ = emberJQuery;
	30	+
	31	+ // Initialize Ember app
	32	+ initializeEmberApp(emberJQuery);
	33	+
	34	+ // Restore original jQuery and $ when done
	35	+ window.jQuery = originalJQuery;
	36	+ window.$ = original$;
20	20	});
	38	+
	39	+ function initializeEmberApp(jQuery) {
	40	+ // Create app with specific jQuery instance
	41	+ window.Todos = Ember.Application.create({
	42	+ rootElement: '#todoappdiv',
	43	+ jQuery: jQuery
	44	+ });
21	21
22		- // Define the todolist store that will write to the TodoListsService
23		- Todos.ApplicationAdapter = DS.Adapter.extend({
24		- createRecord: function(store, type, record) {
25		- console.log("createRecord");
26		- var data = this.serialize(record, { includeId: true });
27		- var query = { create: "1", content: JSON.stringify(data) };
	46	+ // Define the todolist store that will write to the TodoListsService
	47	+ Todos.ApplicationAdapter = DS.Adapter.extend({
	48	+ serialize: function(record, options) {
	49	+ var serialized = record.record.toJSON();
	50	+ if (options && options.includeId) {
	51	+ serialized.id = record.id;
	52	+ }
	53	+ return serialized;
	54	+ },
28	28
29		- return new Ember.RSVP.Promise(function(resolve, reject) {
30		- jQuery.getJSON(
31		- "${xwiki.getURL('TodoLists.TodoListsService')}?page=" +
32		- XWiki.currentSpace + "." + XWiki.currentPage +
33		- "&xpage=plain&outputSyntax=plain",
34		- query
35		- ).then(function(data) {
36		- Ember.run(function() {
37		- resolve(data);
	56	+ createRecord: function(store, type, record) {
	57	+ console.log("createRecord");
	58	+ var serialized = this.serialize(record, { includeId: true });
	59	+ var query = { create: "1", content: JSON.stringify(serialized) };
	60	+
	61	+ return new Ember.RSVP.Promise(function(resolve, reject) {
	62	+ var url = "${xwiki.getURL('TodoLists.TodoListsService')}?page=" +
	63	+ XWiki.currentSpace + "." + XWiki.currentPage +
	64	+ "&xpage=plain&outputSyntax=plain";
	65	+ console.log("Creating record, URL:", url);
	66	+
	67	+ jQuery.getJSON(url, query).then(function(data) {
	68	+ console.log("Create success:", data);
	69	+ Ember.run(function() {
	70	+ resolve(data);
	71	+ });
	72	+ }, function(jqXHR) {
	73	+ console.error("Create error:", jqXHR);
	74	+ Ember.run(function() {
	75	+ reject(jqXHR);
	76	+ });
38	38	});
39		- }, function(jqXHR) {
40		- Ember.run(function() {
41		- reject(jqXHR);
	78	+ });
	79	+ },
	80	+
	81	+ deleteRecord: function(store, type, record) {
	82	+ console.log("deleteRecord");
	83	+ var recordArrays = store.recordArrayManager.recordArraysForRecord(record);
	84	+ if (recordArrays && recordArrays.list && recordArrays.list[0]) {
	85	+ return this.saveAll(recordArrays.list[0].content);
	86	+ }
	87	+ return Ember.RSVP.resolve();
	88	+ },
	89	+
	90	+ find: function(store, type, id) {
	91	+ console.log("find");
	92	+ return Ember.RSVP.resolve();
	93	+ },
	94	+
	95	+ findAll: function(store, type, sinceToken) {
	96	+ console.log("findAll");
	97	+ var query = { since: sinceToken };
	98	+
	99	+ return new Ember.RSVP.Promise(function(resolve, reject) {
	100	+ var url = "${xwiki.getURL('TodoLists.TodoListsService')}?page=" +
	101	+ XWiki.currentSpace + "." + XWiki.currentPage +
	102	+ "&xpage=plain&outputSyntax=plain";
	103	+ console.log("Finding all records, URL:", url);
	104	+
	105	+ jQuery.getJSON(url, query).then(function(data) {
	106	+ console.log("FindAll success:", data);
	107	+ Ember.run(function() {
	108	+ resolve(data);
	109	+ });
	110	+ }, function(jqXHR) {
	111	+ console.error("FindAll error:", jqXHR);
	112	+ Ember.run(function() {
	113	+ reject(jqXHR);
	114	+ });
42	42	});
43	43	});
44		- });
45		- },
46		-
47		- deleteRecord: function(store, type, record) {
48		- console.log("deleteRecord");
49		- var recordArrays = store.recordArrayManager.recordArraysForRecord(record);
50		- if (recordArrays && recordArrays.list && recordArrays.list[0]) {
51		- return this.saveAll(recordArrays.list[0].content);
52		- }
53		- return Ember.RSVP.resolve();
54		- },
55		-
56		- find: function(store, type, id) {
57		- console.log("find");
58		- return Ember.RSVP.resolve();
59		- },
60		-
61		- findAll: function(store, type, sinceToken) {
62		- console.log("findAll");
63		- var query = { since: sinceToken };
	117	+ },
64	64
65		- return new Ember.RSVP.Promise(function(resolve, reject) {
66		- jQuery.getJSON(
67		- "${xwiki.getURL('TodoLists.TodoListsService')}?page=" +
68		- XWiki.currentSpace + "." + XWiki.currentPage +
69		- "&xpage=plain&outputSyntax=plain",
70		- query
71		- ).then(function(data) {
72		- Ember.run(function() {
73		- resolve(data);
	119	+ updateRecord: function(store, type, record) {
	120	+ console.log("updateRecord");
	121	+ var recordArrays = store.recordArrayManager.recordArraysForRecord(record);
	122	+ if (recordArrays && recordArrays.list && recordArrays.list[0]) {
	123	+ return this.saveAll(recordArrays.list[0].content);
	124	+ }
	125	+ return Ember.RSVP.resolve();
	126	+ },
	127	+
	128	+ saveAll: function(alldata) {
	129	+ console.log("saveAll");
	130	+ var query = { save: "1", content: JSON.stringify(alldata) };
	131	+
	132	+ return new Ember.RSVP.Promise(function(resolve, reject) {
	133	+ var currentPage = XWiki.currentSpace + "." + XWiki.currentPage;
	134	+ var url = "${xwiki.getURL('TodoLists.TodoListsService')}?page=" +
	135	+ currentPage + "&xpage=plain&outputSyntax=plain";
	136	+ console.log("Saving all records, URL:", url, "Page:", currentPage);
	137	+
	138	+ jQuery.getJSON(url, query).then(function(data) {
	139	+ console.log("SaveAll success:", data);
	140	+ Ember.run(function() {
	141	+ resolve(data);
	142	+ });
	143	+ }, function(jqXHR) {
	144	+ console.error("SaveAll error:", jqXHR);
	145	+ Ember.run(function() {
	146	+ reject(jqXHR);
	147	+ });
74	74	});
75		- }, function(jqXHR) {
76		- Ember.run(function() {
77		- reject(jqXHR);
78		- });
79	79	});
80		- });
81		- },
82		-
83		- updateRecord: function(store, type, record) {
84		- var recordArrays = store.recordArrayManager.recordArraysForRecord(record);
85		- if (recordArrays && recordArrays.list && recordArrays.list[0]) {
86		- return this.saveAll(recordArrays.list[0].content);
87	87	}
88		- return Ember.RSVP.resolve();
89		- },
90		- saveAll: function(alldata) {
91		- console.log("saveAll");
92		- var query = { save: "1", content: JSON.stringify(alldata) };
93		-return new Ember.RSVP.Promise(function(resolve, reject) {
94		- jQuery.getJSON(
95		- "${xwiki.getURL('TodoLists.TodoListsService')}?page=" +
96		- (
97		- typeof XWiki !== 'undefined' &&
98		- XWiki.currentSpace &&
99		- XWiki.currentPage
100		- ? XWiki.currentSpace + "." + XWiki.currentPage
101		- : document.location.pathname.split('/').pop()
102		- ) +
103		- "&xpage=plain&outputSyntax=plain",
104		- query
105		- ).then(function(data) {
106		- Ember.run(function() {
107		- resolve(data);
108	108	});
109		- }, function(jqXHR) {
110		- Ember.run(function() {
111		- reject(jqXHR);
	152	+
	153	+ // Routing
	154	+ Todos.Router.map(function() {
	155	+ this.resource('todos', { path: '' }, function() {
	156	+ this.route('active');
	157	+ this.route('completed');
	158	+ });
112	112	});
113		- });
114		-});
115	115
	161	+ Todos.TodosRoute = Ember.Route.extend({
	162	+ model: function() {
	163	+ return this.store.find('todo');
	164	+ }
	165	+ });
116	116
117		- // Register the adapter
118		- Todos.ApplicationAdapter.reopen({
119		- namespace: 'api'
120		- });
	167	+ Todos.TodosIndexRoute = Ember.Route.extend({
	168	+ model: function() {
	169	+ return this.modelFor('todos');
	170	+ }
	171	+ });
121	121
122		- // Routing
123		- Todos.Router.map(function() {
124		- this.resource('todos', { path: '' }, function() {
125		- this.route('active');
126		- this.route('completed');
	173	+ Todos.TodosActiveRoute = Ember.Route.extend({
	174	+ model: function() {
	175	+ return this.store.filter('todo', function(todo) {
	176	+ return !todo.get('isCompleted');
	177	+ });
	178	+ },
	179	+ renderTemplate: function(controller) {
	180	+ this.render('todos/index', { controller: controller });
	181	+ }
127	127	});
128		- });
129	129
130		- Todos.TodosRoute = Ember.Route.extend({
131		- model: function() {
132		- return this.store.find('todo');
133		- }
134		- });
	184	+ Todos.TodosCompletedRoute = Ember.Route.extend({
	185	+ model: function() {
	186	+ return this.store.filter('todo', function(todo) {
	187	+ return todo.get('isCompleted');
	188	+ });
	189	+ },
	190	+ renderTemplate: function(controller) {
	191	+ this.render('todos/index', { controller: controller });
	192	+ }
	193	+ });
135	135
136		- Todos.TodosIndexRoute = Ember.Route.extend({
137		- model: function() {
138		- return this.modelFor('todos');
139		- }
140		- });
	195	+ // Data model
	196	+ Todos.Todo = DS.Model.extend({
	197	+ title: DS.attr('string'),
	198	+ priority: DS.attr('string'),
	199	+ assignee: DS.attr('string'),
	200	+ isCompleted: DS.attr('boolean')
	201	+ });
141	141
142		- Todos.TodosActiveRoute = Ember.Route.extend({
143		- model: function() {
144		- return this.store.filter('todo', function(todo) {
145		- return !todo.get('isCompleted');
146		- });
147		- },
148		- renderTemplate: function(controller) {
149		- this.render('todos/index', { controller: controller });
150		- }
151		- });
	203	+ // Controller
	204	+ Todos.TodoController = Ember.ObjectController.extend({
	205	+ actions: {
	206	+ editTodo: function() {
	207	+ this.set('isEditing', true);
	208	+ },
	209	+ acceptChanges: function() {
	210	+ this.set('isEditing', false);
152	152
153		- Todos.TodosCompletedRoute = Ember.Route.extend({
154		- model: function() {
155		- return this.store.filter('todo', function(todo) {
156		- return todo.get('isCompleted');
157		- });
158		- },
159		- renderTemplate: function(controller) {
160		- this.render('todos/index', { controller: controller });
161		- }
162		- });
	212	+ if (Ember.isEmpty(this.get('model.title'))) {
	213	+ this.send('removeTodo');
	214	+ } else {
	215	+ this.get('model').save();
	216	+ }
	217	+ },
	218	+ removeTodo: function() {
	219	+ var todo = this.get('model');
	220	+ todo.deleteRecord();
	221	+ todo.save();
	222	+ }
	223	+ },
163	163
164		- // Data model
165		- Todos.Todo = DS.Model.extend({
166		- title: DS.attr('string'),
167		- priority: DS.attr('string'),
168		- assignee: DS.attr('string'),
169		- isCompleted: DS.attr('boolean')
170		- });
	225	+ isEditing: false,
171	171
172		- // Controller
173		- Todos.TodoController = Ember.ObjectController.extend({
174		- actions: {
175		- editTodo: function() {
176		- this.set('isEditing', true);
177		- },
178		- acceptChanges: function() {
179		- this.set('isEditing', false);
	227	+ isCompleted: function(key, value) {
	228	+ var model = this.get('model');
180	180
181		- if (Ember.isEmpty(this.get('model.title'))) {
182		- this.send('removeTodo');
	230	+ if (value === undefined) {
	231	+ // Property being used as a getter
	232	+ return model.get('isCompleted');
183	183	} else {
184		- this.get('model').save();
	234	+ // Property being used as setter
	235	+ model.set('isCompleted', value);
	236	+ model.save();
	237	+ return value;
185	185	}
186		- },
187		- removeTodo: function() {
188		- var todo = this.get('model');
189		- todo.deleteRecord();
190		- todo.save();
191		- }
192		- },
	239	+ }.property('model.isCompleted')
	240	+ });
193	193
194		- isEditing: false,
	242	+ Todos.TodosController = Ember.ArrayController.extend({
	243	+ actions: {
	244	+ createTodo: function() {
	245	+ // Get the todo title set by the "New Todo" text field
	246	+ var title = this.get('newTitle');
	247	+ if (!title || !title.trim()) { return; }
195	195
196		- isCompleted: function(key, value) {
197		- var model = this.get('model');
	249	+ console.log("Creating new todo with title:", title);
198	198
199		- if (value === undefined) {
200		- // Property being used as a getter
201		- return model.get('isCompleted');
202		- } else {
203		- // Property being used as setter
204		- model.set('isCompleted', value);
205		- model.save();
206		- return value;
207		- }
208		- }.property('model.isCompleted')
209		- });
	251	+ // Create the new Todo model
	252	+ var todo = this.store.createRecord('todo', {
	253	+ title: title,
	254	+ priority: "P3",
	255	+ assignee: "all",
	256	+ isCompleted: false
	257	+ });
210	210
211		- Todos.TodosController = Ember.ArrayController.extend({
212		- actions: {
213		- createTodo: function() {
214		- // Get the todo title set by the "New Todo" text field
215		- var title = this.get('newTitle');
216		- if (!title || !title.trim()) { return; }
	259	+ // Clear the "New Todo" text field
	260	+ this.set('newTitle', '');
217	217
218		- // Create the new Todo model
219		- var todo = this.store.createRecord('todo', {
220		- title: title,
221		- priority: "P3",
222		- assignee: "all",
223		- isCompleted: false
224		- });
	262	+ // Save the new model
	263	+ todo.save().then(function(savedTodo) {
	264	+ console.log("Todo saved successfully:", savedTodo);
	265	+ // Force a refresh of the list after saving
	266	+ Ember.run.later(function() {
	267	+ console.log("Refreshing todo list");
	268	+ Todos.store.find('todo');
	269	+ }, 100);
	270	+ }, function(error) {
	271	+ console.error("Failed to save todo:", error);
	272	+ });
	273	+ },
	274	+
	275	+ clearCompleted: function() {
	276	+ var completed = this.filter(function(todo) {
	277	+ return todo.get('isCompleted');
	278	+ });
	279	+
	280	+ completed.forEach(function(todo) {
	281	+ todo.deleteRecord();
	282	+ todo.save();
	283	+ });
	284	+ }
	285	+ },
225	225
226		- // Clear the "New Todo" text field
227		- this.set('newTitle', '');
	287	+ remaining: function() {
	288	+ return this.filter(function(todo) {
	289	+ return !todo.get('isCompleted');
	290	+ }).get('length');
	291	+ }.property('@each.isCompleted'),
228	228
229		- // Save the new model
230		- todo.save().then(function() {
231		- // Force a refresh of the list after saving
232		- Ember.run.later(function() {
233		- Todos.store.find('todo');
234		- }, 100);
235		- });
236		- },
	293	+ inflection: function() {
	294	+ var remaining = this.get('remaining');
	295	+ return remaining === 1 ? 'item' : 'items';
	296	+ }.property('remaining'),
237	237
238		- clearCompleted: function() {
239		- var completed = this.filter(function(todo) {
	298	+ hasCompleted: function() {
	299	+ return this.get('completed') > 0;
	300	+ }.property('completed'),
	301	+
	302	+ completed: function() {
	303	+ return this.filter(function(todo) {
240	240	return todo.get('isCompleted');
241		- });
242		-
243		- completed.forEach(function(todo) {
244		- todo.deleteRecord();
245		- todo.save();
246		- });
247		- }
248		- },
	305	+ }).get('length');
	306	+ }.property('@each.isCompleted'),
249	249
250		- remaining: function() {
251		- return this.filter(function(todo) {
252		- return !todo.get('isCompleted');
253		- }).get('length');
254		- }.property('@each.isCompleted'),
	308	+ allAreDone: function(key, value) {
	309	+ if (value === undefined) {
	310	+ return this.get('length') > 0 && this.every(function(todo) {
	311	+ return todo.get('isCompleted');
	312	+ });
	313	+ } else {
	314	+ this.forEach(function(todo) {
	315	+ todo.set('isCompleted', value);
	316	+ todo.save();
	317	+ });
	318	+ return value;
	319	+ }
	320	+ }.property('@each.isCompleted')
	321	+ });
255	255
256		- inflection: function() {
257		- var remaining = this.get('remaining');
258		- return remaining === 1 ? 'item' : 'items';
259		- }.property('remaining'),
260		-
261		- hasCompleted: function() {
262		- return this.get('completed') > 0;
263		- }.property('completed'),
264		-
265		- completed: function() {
266		- return this.filter(function(todo) {
267		- return todo.get('isCompleted');
268		- }).get('length');
269		- }.property('@each.isCompleted'),
270		-
271		- allAreDone: function(key, value) {
272		- if (value === undefined) {
273		- return this.get('length') > 0 && this.every(function(todo) {
274		- return todo.get('isCompleted');
275		- });
276		- } else {
277		- this.forEach(function(todo) {
278		- todo.set('isCompleted', value);
279		- todo.save();
280		- });
281		- return value;
	323	+ // Editing
	324	+ Todos.EditTodoView = Ember.TextField.extend({
	325	+ didInsertElement: function() {
	326	+ this.$().focus();
282	282	}
283		- }.property('@each.isCompleted')
284		- });
	328	+ });
285	285
286		- // Editing
287		- Todos.EditTodoView = Ember.TextField.extend({
288		- didInsertElement: function() {
289		- this.$().focus();
290		- }
291		- });
292		-
293		- Ember.Handlebars.helper('edit-todo', Todos.EditTodoView);
	330	+ Ember.Handlebars.helper('edit-todo', Todos.EditTodoView);
	331	+ }
294	294	});
295	295