summaryrefslogtreecommitdiff
path: root/frontend/gamma/js/main.js
authorGiulio Cesare Solaroli <giulio.cesare@solaroli.it>2012-03-03 22:06:27 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@solaroli.it>2012-03-03 22:06:27 (UTC)
commite7e021141d7906b537b3622ed706017f31222dfd (patch) (unidiff)
treed9366dae335a9bded5c0ee859895abe251790818 /frontend/gamma/js/main.js
parenta0661c3b02aa26d6b08ff13dc321e09478868159 (diff)
parentcf9c0c34e1358452e0c7276c5b3ec6598f0c089d (diff)
downloadclipperz-e7e021141d7906b537b3622ed706017f31222dfd.zip
clipperz-e7e021141d7906b537b3622ed706017f31222dfd.tar.gz
clipperz-e7e021141d7906b537b3622ed706017f31222dfd.tar.bz2
Merge pull request #28 from gcsolaroli/master
Added static resources used by /beta when exiting the application
Diffstat (limited to 'frontend/gamma/js/main.js') (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/gamma/js/main.js15
1 files changed, 1 insertions, 14 deletions
diff --git a/frontend/gamma/js/main.js b/frontend/gamma/js/main.js
index 352c4c7..a9fd65e 100644
--- a/frontend/gamma/js/main.js
+++ b/frontend/gamma/js/main.js
@@ -51,15 +51,10 @@ function run() {
51 var shouldShowRegistrationForm; 51 var shouldShowRegistrationForm;
52 var useCompactDesign; 52 var useCompactDesign;
53 var controllerParameters; 53 var controllerParameters;
54 //var iPhoneDesign;
55
56 //MochiKit.Signal.connect(document.body, 'onkeydown', _pm_logEvent);
57 //MochiKit.Signal.connect(document.body, 'onkeypress', _pm_logEvent);
58 //MochiKit.Signal.connect(document.body, 'onclick', _pm_logEvent);
59 54
60 controllerParameters = {}; 55 controllerParameters = {};
61 56
62 MochiKit.DOM.removeElement('javaScriptAlert'); 57 //MochiKit.DOM.removeElement('javaScriptAlert');
63 Clipperz.PM.Strings.Languages.initSetup(); 58 Clipperz.PM.Strings.Languages.initSetup();
64 59
65 if (window.location.search.indexOf('registration') != -1) { 60 if (window.location.search.indexOf('registration') != -1) {
@@ -72,12 +67,6 @@ function run() {
72 controllerParameters['autocomplete'] = 'on' 67 controllerParameters['autocomplete'] = 'on'
73 } 68 }
74 69
75 //if ((window.location.search.indexOf('iPhone') != -1) || (navigator.userAgent.match('iPhone'))) {
76 // iPhoneDesign = true;
77 //} else {
78 // iPhoneDesign = false;
79 //}
80
81 if (window.location.search.indexOf('compact') != -1) { 70 if (window.location.search.indexOf('compact') != -1) {
82 useCompactDesign = true; 71 useCompactDesign = true;
83 } else { 72 } else {
@@ -86,8 +75,6 @@ function run() {
86 75
87 if (useCompactDesign == true) { 76 if (useCompactDesign == true) {
88 Clipperz.PM.RunTime.mainController = new Clipperz.PM.UI.Compact.Controllers.MainController(controllerParameters); 77 Clipperz.PM.RunTime.mainController = new Clipperz.PM.UI.Compact.Controllers.MainController(controllerParameters);
89 //} else if (iPhoneDesign == true) {
90 // Clipperz.PM.RunTime.mainController = new Clipperz.PM.UI.iPhone.Controllers.MainController();
91 } else { 78 } else {
92 Clipperz.PM.RunTime.mainController = new Clipperz.PM.UI.Web.Controllers.MainController(controllerParameters); 79 Clipperz.PM.RunTime.mainController = new Clipperz.PM.UI.Web.Controllers.MainController(controllerParameters);
93 } 80 }