0.2.64

- Bug fix berita dari lkomp barusan - Bug fix jika internet lemot dan ganti menu dengan cepat nanti malah ngawur isinya - Kode inti dipendekkan :p
Smankusors · Oct 27, 2016 · 8f47346 · 8f47346
1 parent 71642fb
commit 8f47346
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 37 deletions.
diff --git a/chrome/js/main.js b/chrome/js/main.js
@@ -1,9 +1,3 @@
-console.log("MENU UTAMA");
-
-chrome.storage.local.get('news', function(data) {
-	if (data.news) $("#content").html(data.news);
-});
-
 $('#logout').click(function (){
 	console.log("logouut");
 	chrome.storage.local.set({'loggedOn' : false});
@@ -24,14 +18,16 @@ $("#mNewsSIM").click(function() {
 			$("#content").fadeIn(100);
 		});
 		$.get("http://sim.stts.edu/pengumuman_data.php", function(result) {
-			var parsed = parsePengumumanSIM(result);
-			$("#content").html(parsed);
-			chrome.storage.local.set({'newsSIM' : parsed});
-			console.log("SIM NEWS updated!");
-			$(".link-pengumuman").click(function(){
-				var pdfLink = this.href;
-				window.open(pdfLink,'_blank');
-			});
+			if ($('#mNewsSIM').attr('class') == "selected") {
+				var parsed = parsePengumumanSIM(result);
+				$("#content").html(parsed);
+				chrome.storage.local.set({'newsSIM' : parsed});
+				console.log("SIM NEWS updated!");
+				$(".link-pengumuman").click(function(){
+					var pdfLink = this.href;
+					window.open(pdfLink,'_blank');
+				});
+			}
 		});
 	},100);
 });
@@ -47,11 +43,13 @@ $("#mNewsLab").click(function() {
 			$("#content").fadeIn(100);
 		});
 		$.get("http://lkomp.stts.edu", function(result) {
-			var parsed = parsePengumumanLab(result);
-			$("#content").html(parsed);
-			chrome.storage.local.set({'newsLab' : parsed});
-			console.log("Lab NEWS updated!");
-			$("#content").fadeIn(100);
+			if ($('#mNewsLab').attr('class') == "selected") {
+				var parsed = parsePengumumanLab(result);
+				$("#content").html(parsed);
+				chrome.storage.local.set({'newsLab' : parsed});
+				console.log("Lab NEWS updated!");
+				$("#content").fadeIn(100);
+			}
 		});
 	},100);
 });
@@ -66,17 +64,17 @@ $("#mSched").click(function() {
 			if (data.sched) $("#content").html(data.sched);
 			$("#content").fadeIn(100);
 		});
-		$.get("http://sim.stts.edu/jadwal_kul.php", function(result) {
-			$("#content").html(parseJadwalKul(result));
-			$.get( "http://sim.stts.edu/jadwal_ujian.php", function(result){
-				$("#content").append(parseJadwalUjian(result));
-				$.get( "http://sim.stts.edu/jadwal_prakecc.php", function(result){
-					$("#content").append(parseJadwalPrakECC(result));
-					chrome.storage.local.set({'sched' : $("#content").html()});
-					console.log("SCHED updated!");
-
+		$.get("http://sim.stts.edu/jadwal_kul.php", function(jadwal_kul) {
+			$.get( "http://sim.stts.edu/jadwal_ujian.php", function(jadwal_ujian){
+				$.get( "http://sim.stts.edu/jadwal_prakecc.php", function(jadwal_prakecc){
+					if ($('#mSched').attr('class') == "selected") {
+						$("#content").html(parseJadwalKul(jadwal_kul));
+						$("#content").append(parseJadwalUjian(jadwal_ujian));
+						$("#content").append(parseJadwalPrakECC(jadwal_prakecc));
+						chrome.storage.local.set({'sched' : $("#content").html()});
+						console.log("SCHED updated!");
+					}
 				});
-
 			});
 		});
 	}, 100);
@@ -97,12 +95,12 @@ $("#mAbout").click(function() {
 });
 
 var userID, password;
+chrome.storage.local.get('news', function(data) {
+	if (data.news) $("#content").html(data.news);
+});
 $.get( "http://sim.stts.edu/index.php", function(data){
 	if (data.includes("Selamat Datang,")) {
-		var re = /([\s\S]*)ang, (.*) \<inp.*([\s\S]*)/;
-		var fullName = data.replace(re,"$2");
-		var abbName = fullName.replace(/ ([A-Z])\w+/g,' $1.');
-		$("#nama").html(abbName);
+		$("#nama").html(parseNama(data));
 		$.get("http://sim.stts.edu/pengumuman_data.php", function(result) {
 			var parsed = parsePengumumanSIM(result);
 			$("#content").html(parsed);
@@ -123,5 +121,4 @@ $.get( "http://sim.stts.edu/index.php", function(data){
 			});
 		});
 	}
-
-});
+});
diff --git a/chrome/js/parser.js b/chrome/js/parser.js
@@ -1,3 +1,9 @@
+function parseNama(s) {
+	var nama = s.replace(/([\s\S]*)ang, (.*) \<inp.*([\s\S]*)/,"$2");
+	nama = nama.replace(/ ([A-Z])\w+/g,' $1.');
+	return nama;
+}
+
 function parsePengumumanSIM(s) {
 	var div = document.createElement('div');
     div.innerHTML = s;
@@ -20,7 +26,9 @@ function parsePengumumanLab(s) {
 	var beritaLab = html.getElementsByClassName('main');
 	var ganti = beritaLab[0].innerHTML;
 	ganti = ganti.replace(/<br><br>/g, '<br />\n');
-	ganti = ganti.replace(/<img .*\n/g, '');
+	ganti = ganti.replace(/<img class="new" src=".\/images\/icon-new.png">/g, '');
+	console.log(ganti);
+	ganti = ganti.replace(/<img src=".\/images\/banner.jpg"><br \/>/g, '');
 	ganti = ganti.replace(/.*pagging([\s\S]*)/g, '');
 	ganti = ganti.replace(/(.*an">)Ditambahkan Oleh (.*)<\/span>.*/g, '$1$2</span><br />');
 	ganti = ganti.replace(/.*\n.*<a/, '<a');

diff --git a/chrome/manifest.json b/chrome/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "iSTTS Helper",
   "description": "A browser extension to help iSTTS students with the provided information systems.",
-  "version": "0.2.62",
+  "version": "0.2.64",
   "author": "Smankusors (Antony Kurniawan)",
   "homepage_url": "http://sim.stts.edu",
   "icons": {