Merge branch 'master' of gitlab.com:participa/proposal-app

Leandro Santos
2 parents df18c64e a3ed80cf
Showing 3 changed files with 129 additions and 0 deletions Show diff stats
index.html
js/jquery.cookie.js
js/main.js
@@ -6,6 +6,7 @@
     <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css" />
     <script src='js/jquery-2.1.3.min.js'></script>
     <script src='js/jquery-ui-1.11.4.custom/jquery-ui.min.js'></script>
+    <script src='js/jquery.cookie.js'></script>
     <script src='js/handlebars-v3.0.1.js'></script>
     <script src='js/handlebars-helpers.js'></script>
     <script src='js/jquery.dotdotdot.min.js'></script>
@@ -0,0 +1,114 @@
+/*!
+ * jQuery Cookie Plugin v1.4.1
+ * https://github.com/carhartl/jquery-cookie
+ *
+ * Copyright 2006, 2014 Klaus Hartl
+ * Released under the MIT license
+ */
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		// AMD (Register as an anonymous module)
+		define(['jquery'], factory);
+	} else if (typeof exports === 'object') {
+		// Node/CommonJS
+		module.exports = factory(require('jquery'));
+	} else {
+		// Browser globals
+		factory(jQuery);
+	}
+}(function ($) {
+
+	var pluses = /\+/g;
+
+	function encode(s) {
+		return config.raw ? s : encodeURIComponent(s);
+	}
+
+	function decode(s) {
+		return config.raw ? s : decodeURIComponent(s);
+	}
+
+	function stringifyCookieValue(value) {
+		return encode(config.json ? JSON.stringify(value) : String(value));
+	}
+
+	function parseCookieValue(s) {
+		if (s.indexOf('"') === 0) {
+			// This is a quoted cookie as according to RFC2068, unescape...
+			s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
+		}
+
+		try {
+			// Replace server-side written pluses with spaces.
+			// If we can't decode the cookie, ignore it, it's unusable.
+			// If we can't parse the cookie, ignore it, it's unusable.
+			s = decodeURIComponent(s.replace(pluses, ' '));
+			return config.json ? JSON.parse(s) : s;
+		} catch(e) {}
+	}
+
+	function read(s, converter) {
+		var value = config.raw ? s : parseCookieValue(s);
+		return $.isFunction(converter) ? converter(value) : value;
+	}
+
+	var config = $.cookie = function (key, value, options) {
+
+		// Write
+
+		if (arguments.length > 1 && !$.isFunction(value)) {
+			options = $.extend({}, config.defaults, options);
+
+			if (typeof options.expires === 'number') {
+				var days = options.expires, t = options.expires = new Date();
+				t.setMilliseconds(t.getMilliseconds() + days * 864e+5);
+			}
+
+			return (document.cookie = [
+				encode(key), '=', stringifyCookieValue(value),
+				options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
+				options.path    ? '; path=' + options.path : '',
+				options.domain  ? '; domain=' + options.domain : '',
+				options.secure  ? '; secure' : ''
+			].join(''));
+		}
+
+		// Read
+
+		var result = key ? undefined : {},
+			// To prevent the for loop in the first place assign an empty array
+			// in case there are no cookies at all. Also prevents odd result when
+			// calling $.cookie().
+			cookies = document.cookie ? document.cookie.split('; ') : [],
+			i = 0,
+			l = cookies.length;
+
+		for (; i < l; i++) {
+			var parts = cookies[i].split('='),
+				name = decode(parts.shift()),
+				cookie = parts.join('=');
+
+			if (key === name) {
+				// If second argument (value) is a function it's a converter...
+				result = read(cookie, value);
+				break;
+			}
+
+			// Prevent storing a cookie that we couldn't decode.
+			if (!key && (cookie = read(cookie)) !== undefined) {
+				result[name] = cookie;
+			}
+		}
+
+		return result;
+	};
+
+	config.defaults = {};
+
+	$.removeCookie = function (key, options) {
+		// Must not alter options, thus extending a fresh object...
+		$.cookie(key, '', $.extend({}, options, { expires: -1 }));
+		return !$.cookie(key);
+	};
+
+}));
@@ -204,6 +204,16 @@ function loadRandomProposal(topic_id, private_token) {
   });
 }
+jQuery(document).ready(function($) {
+  if($.cookie('_dialoga_session')) {
+    var url = host + '/api/v1/users/me?private_token=' + $.cookie('_dialoga_session');
+    $.getJSON(url).done(function( data ) {
+      logged_in = true;
+      private_token = $.cookie('_dialoga_session');
+    });
+  }
+});
+
 function loginCallback(loggedIn, token) {
   logged_in = loggedIn;
   $('.login .message').text('');
@@ -213,6 +223,7 @@ function loginCallback(loggedIn, token) {
     loginButton.siblings('.save-article-form').show();
     loginButton.siblings('.save-article-form .message').show();
     loginButton.siblings('.login-container').hide();
+    $.cookie('_dialoga_session', private_token);
   } else {
     loginButton.siblings('.save-article-form').hide();
     loginButton.siblings('.login-container').show();
@@ -229,6 +240,9 @@ jQuery(document).ready(function($) {
       type: 'post',
       url: host + '/api/v1/login',
       data: $(this).parents('.login').serialize(),
+      xhrFields: {
+        //withCredentials: true
+      }
     }).done(function(data) {
       loginCallback(true, data.private_token);
     }).fail(function(data) {
@@ -0,0 +1,114 @@		@@ -0,0 +1,114 @@
	1	+/*!
	2	+ * jQuery Cookie Plugin v1.4.1
	3	+ * https://github.com/carhartl/jquery-cookie
	4	+ *
	5	+ * Copyright 2006, 2014 Klaus Hartl
	6	+ * Released under the MIT license
	7	+ */
	8	+(function (factory) {
	9	+ if (typeof define === 'function' && define.amd) {
	10	+ // AMD (Register as an anonymous module)
	11	+ define(['jquery'], factory);
	12	+ } else if (typeof exports === 'object') {
	13	+ // Node/CommonJS
	14	+ module.exports = factory(require('jquery'));
	15	+ } else {
	16	+ // Browser globals
	17	+ factory(jQuery);
	18	+ }
	19	+}(function ($) {
	20	+
	21	+ var pluses = /\+/g;
	22	+
	23	+ function encode(s) {
	24	+ return config.raw ? s : encodeURIComponent(s);
	25	+ }
	26	+
	27	+ function decode(s) {
	28	+ return config.raw ? s : decodeURIComponent(s);
	29	+ }
	30	+
	31	+ function stringifyCookieValue(value) {
	32	+ return encode(config.json ? JSON.stringify(value) : String(value));
	33	+ }
	34	+
	35	+ function parseCookieValue(s) {
	36	+ if (s.indexOf('"') === 0) {
	37	+ // This is a quoted cookie as according to RFC2068, unescape...
	38	+ s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
	39	+ }
	40	+
	41	+ try {
	42	+ // Replace server-side written pluses with spaces.
	43	+ // If we can't decode the cookie, ignore it, it's unusable.
	44	+ // If we can't parse the cookie, ignore it, it's unusable.
	45	+ s = decodeURIComponent(s.replace(pluses, ' '));
	46	+ return config.json ? JSON.parse(s) : s;
	47	+ } catch(e) {}
	48	+ }
	49	+
	50	+ function read(s, converter) {
	51	+ var value = config.raw ? s : parseCookieValue(s);
	52	+ return $.isFunction(converter) ? converter(value) : value;
	53	+ }
	54	+
	55	+ var config = $.cookie = function (key, value, options) {
	56	+
	57	+ // Write
	58	+
	59	+ if (arguments.length > 1 && !$.isFunction(value)) {
	60	+ options = $.extend({}, config.defaults, options);
	61	+
	62	+ if (typeof options.expires === 'number') {
	63	+ var days = options.expires, t = options.expires = new Date();
	64	+ t.setMilliseconds(t.getMilliseconds() + days * 864e+5);
	65	+ }
	66	+
	67	+ return (document.cookie = [
	68	+ encode(key), '=', stringifyCookieValue(value),
	69	+ options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
	70	+ options.path ? '; path=' + options.path : '',
	71	+ options.domain ? '; domain=' + options.domain : '',
	72	+ options.secure ? '; secure' : ''
	73	+ ].join(''));
	74	+ }
	75	+
	76	+ // Read
	77	+
	78	+ var result = key ? undefined : {},
	79	+ // To prevent the for loop in the first place assign an empty array
	80	+ // in case there are no cookies at all. Also prevents odd result when
	81	+ // calling $.cookie().
	82	+ cookies = document.cookie ? document.cookie.split('; ') : [],
	83	+ i = 0,
	84	+ l = cookies.length;
	85	+
	86	+ for (; i < l; i++) {
	87	+ var parts = cookies[i].split('='),
	88	+ name = decode(parts.shift()),
	89	+ cookie = parts.join('=');
	90	+
	91	+ if (key === name) {
	92	+ // If second argument (value) is a function it's a converter...
	93	+ result = read(cookie, value);
	94	+ break;
	95	+ }
	96	+
	97	+ // Prevent storing a cookie that we couldn't decode.
	98	+ if (!key && (cookie = read(cookie)) !== undefined) {
	99	+ result[name] = cookie;
	100	+ }
	101	+ }
	102	+
	103	+ return result;
	104	+ };
	105	+
	106	+ config.defaults = {};
	107	+
	108	+ $.removeCookie = function (key, options) {
	109	+ // Must not alter options, thus extending a fresh object...
	110	+ $.cookie(key, '', $.extend({}, options, { expires: -1 }));
	111	+ return !$.cookie(key);
	112	+ };
	113	+
	114	+}));