mirror of
				https://github.com/nerzhul/ocsms.git
				synced 2025-10-31 02:17:38 +00:00 
			
		
		
		
	Migrate jquery.documentready to AngularJS
This commit is contained in:
		
							parent
							
								
									d8ecc06314
								
							
						
					
					
						commit
						68b2f319c3
					
				| @ -34,8 +34,8 @@ function arrayUnique(arr) { | |||||||
| 	return unq; | 	return unq; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| app.controller('OcSmsController', ['$scope', | app.controller('OcSmsController', /*['$scope',*/ | ||||||
| 	function ($scope) { | 	function ($timeout, $scope) { | ||||||
| 		$scope.buttons = [ | 		$scope.buttons = [ | ||||||
| 			{text: "Send"} | 			{text: "Send"} | ||||||
| 		]; | 		]; | ||||||
| @ -73,8 +73,38 @@ app.controller('OcSmsController', ['$scope', | |||||||
| 				$scope.contacts.push(ct); | 				$scope.contacts.push(ct); | ||||||
| 			}); | 			}); | ||||||
| 		}; | 		}; | ||||||
|  | 
 | ||||||
|  | 		$timeout(function () { | ||||||
|  | 			// Register real title
 | ||||||
|  | 			g_originalTitle = document.title; | ||||||
|  | 
 | ||||||
|  | 			// Now bind the events when we click on the phone number
 | ||||||
|  | 			$.getJSON(OC.generateUrl('/apps/ocsms/get/peerlist'), function(jsondata, status) { | ||||||
|  | 				fetchInitialPeerList(jsondata); | ||||||
|  | 
 | ||||||
|  | 				var pnParam = $.urlParam('phonenumber'); | ||||||
|  | 				if (pnParam != null) { | ||||||
|  | 					var urlPhoneNumber = decodeURIComponent(pnParam); | ||||||
|  | 					if (urlPhoneNumber != null) { | ||||||
|  | 						fetchConversation(urlPhoneNumber); | ||||||
|  | 						changeSelectedConversation($("a[mailbox-navigation='" + urlPhoneNumber + "']")); | ||||||
|  | 					} | ||||||
|  | 				} | ||||||
|  | 				// Don't show message headers if no conversation selected
 | ||||||
|  | 				else { | ||||||
|  | 					if ($('#app-content-header').is(':visible')) { | ||||||
|  | 						$('#app-content-header').hide(); | ||||||
|  | 					} | ||||||
|  | 				} | ||||||
|  | 
 | ||||||
|  | 			}); | ||||||
|  | 			fetchInitialSettings(); | ||||||
|  | 			initDesktopNotifies(); | ||||||
|  | 			setInterval(refreshConversation, 10000); | ||||||
|  | 			setInterval(checkNewMessages, 10000); | ||||||
|  | 		}); | ||||||
| 	} | 	} | ||||||
| ]); | ); | ||||||
| 
 | 
 | ||||||
| $.urlParam = function(name){ | $.urlParam = function(name){ | ||||||
| 	var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href); | 	var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href); | ||||||
| @ -404,36 +434,6 @@ function fetchInitialSettings() { | |||||||
| 	}); | 	}); | ||||||
| } | } | ||||||
| (function ($, OC) { | (function ($, OC) { | ||||||
| 	$(document).ready(function () { |  | ||||||
| 		// Register real title
 |  | ||||||
| 		g_originalTitle = document.title; |  | ||||||
| 
 |  | ||||||
| 		// Now bind the events when we click on the phone number
 |  | ||||||
| 		$.getJSON(OC.generateUrl('/apps/ocsms/get/peerlist'), function(jsondata, status) { |  | ||||||
| 			fetchInitialPeerList(jsondata); |  | ||||||
| 
 |  | ||||||
| 			var pnParam = $.urlParam('phonenumber'); |  | ||||||
| 			if (pnParam != null) { |  | ||||||
| 				var urlPhoneNumber = decodeURIComponent(pnParam); |  | ||||||
| 				if (urlPhoneNumber != null) { |  | ||||||
| 					fetchConversation(urlPhoneNumber); |  | ||||||
| 					changeSelectedConversation($("a[mailbox-navigation='" + urlPhoneNumber + "']")); |  | ||||||
| 				} |  | ||||||
| 			} |  | ||||||
| 			// Don't show message headers if no conversation selected
 |  | ||||||
| 			else { |  | ||||||
| 				if ($('#app-content-header').is(':visible')) { |  | ||||||
| 					$('#app-content-header').hide(); |  | ||||||
| 				} |  | ||||||
| 			} |  | ||||||
| 
 |  | ||||||
| 		}); |  | ||||||
| 		fetchInitialSettings(); |  | ||||||
| 		initDesktopNotifies(); |  | ||||||
| 		setInterval(refreshConversation, 10000); |  | ||||||
| 		setInterval(checkNewMessages, 10000); |  | ||||||
| 	}); |  | ||||||
| 
 |  | ||||||
| 	// reset count and title
 | 	// reset count and title
 | ||||||
| 	window.onfocus = function () { | 	window.onfocus = function () { | ||||||
| 		g_unreadCountCurrentConv = 0; | 		g_unreadCountCurrentConv = 0; | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user