From 70b6b7ff1d8648b185582a46fa74ae94ed336cf5 Mon Sep 17 00:00:00 2001
From: "sebastien.lelong" <sebastien.lelong@gmail.com>
Date: Sat, 14 May 2016 08:45:05 -0700
Subject: [PATCH] new Shawn flairs set replacing Amanda's broken one shorten
 url when composing a set

---
 app.yaml          |  2 +-
 choose.html       | 21 ++++++++++++++++++++-
 static/js/sets.js |  8 ++++----
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/app.yaml b/app.yaml
index 2b8bcb7..87df6bc 100644
--- a/app.yaml
+++ b/app.yaml
@@ -1,5 +1,5 @@
 application: eventflairs
-version: 12
+version: 13
 runtime: python27
 api_version: 1
 threadsafe: no
diff --git a/choose.html b/choose.html
index 06a37d0..a286ee2 100755
--- a/choose.html
+++ b/choose.html
@@ -37,6 +37,9 @@ <h5 class="cart-title">Your Custom Flairs Sets</h5>
         <div id="flairs-button-next" style="display: none; text-align: center; background-color: rgb(0, 0, 139); color: white; font-size: 0.8em; background-position: initial initial; background-repeat: initial initial;">Go back to gadget, click "import" and paste</div>
       </div>
       <div id="custom-icons"></div>
+      <div style="text-align:center">
+        <div id="flairs-limit-reached" style="display: none; text-align: center; background-color: rgb(227, 53, 0); color: white; font-size: 0.8em; background-position: initial initial; background-repeat: initial initial;">Limit reached, can't add more...</div>
+      </div>
     </div>
     <!-- Header Wrapper -->
       <div id="header-wrapper">
@@ -217,7 +220,18 @@ <h3>Mail</h3>
   function selectIcon(elem)
   {
     var url = elem.src;
-    // -> extract roo url and check if it exists
+    // shorten url to save space in userdefault's gadget
+    // so we can add more icons
+    $.ajax({
+      "type":"GET",
+      "url":"https://eventflairs.appspot.com/shorturl?service=goo.gl&longurl=" + url,"async":false}
+    ).done(function(resp){
+      url = JSON.parse(resp)['short']
+    }).fail(function( jqXHR, textStatus ) {
+      console.log("Will use long URL, cannot shorten URL: " + textStatus);
+    });
+
+    // -> extract root url and check if it exists
     var res = splitRootIcon(url);
     var icon = res.icon;
     var root = res.root;
@@ -229,6 +243,11 @@ <h3>Mail</h3>
     {
       userFlairs[root] = [icon];
     }
+    // check max limit (userdefault prefs gadget limit)
+    if(JSON.stringify(userFlairs).length > 1024) {
+      $("#flairs-limit-reached").show().delay(2000).fadeOut();
+      return;
+    }
     // update clipboard content
     $("#flairs-button").attr("data-clipboard-text",JSON.stringify(userFlairs));
      // add img element
diff --git a/static/js/sets.js b/static/js/sets.js
index 8dd873d..cf204df 100644
--- a/static/js/sets.js
+++ b/static/js/sets.js
@@ -20,10 +20,10 @@ var sets = [
 	 'description' : 'Minimalistic icon set, using <a href="http://somerandomdude.com/work/iconic/">Iconic</a> collection',
 	 'def' : {"https://eventflairs.appspot.com/static/images/flairs/iconic/":["black_stop.png","blue_stop.png","brown_dark_stop.png","brown_light_stop.png","cyan_stop.png","gray_dark_stop.png","gray_light_stop.png","green_stop.png","magenta_stop.png","orange_stop.png","red_stop.png","tan_stop.png","yellow_stop.png","black_cd.png","blue_cd.png","brown_dark_cd.png","brown_light_cd.png","cyan_cd.png","gray_dark_cd.png","gray_light_cd.png","green_cd.png","magenta_cd.png","orange_cd.png","red_cd.png","tan_cd.png","yellow_cd.png","black_layers_alt.png","blue_layers_alt.png","brown_dark_layers_alt.png","brown_light_layers_alt.png","cyan_layers_alt.png","gray_dark_layers_alt.png","gray_light_layers_alt.png","green_layers_alt.png","magenta_layers_alt.png","orange_layers_alt.png","red_layers_alt.png","tan_layers_alt.png","yellow_layers_alt.png"]}
 	},
-	{'name' : 'Amanda flairs',
-	 'author' : 'Amanda',
-	 'description' : 'Amanda flairs, based on <a href="http://www.fatcow.com/free-icons">Fatcow</a> collection',
-	 'def' : {"https://goo.gl/":["rKHNLj","Wv9zi8","87SSjE","hMWNlU","KuNg7s","M2fTuK","dpTDr3","R7ze4S","nSgtYG","VM9m2A","Cr2rGK","W6HoMN","Bo2y4b","25sRfy","q0dvOZ","444C8C","PnqzC9","3gGseP","ZpNsgW","0I6uwd","568Lqk","RTgNzY","aVXvKh","qsAo7f","zXVk9D","MLa4Ct","nXEKGk","ZC5kPt","4OQDqZ","sG92an","2EQ8d2","9XZCoL","uUWHkY","fIE716","7cS20z","Oo93JP","03n0we","4NCRGF","HPHQXu","RKVvvn","kFGuro","8pcqsH","2FV4DB","ATClCU","Gfq1C3","O6aobM","R3YhPq","ymzgOI","UsjE4X","vA99pV","y8Y2el","OEEVLm","9rqBPS","WdyGBV","tSJKao","iscRZK","5U8jF4","QtyVFh","lB5S4I","gWNKD5","X5FlZR","1DP4yC","bcb52J","hOsPn7","42bg49","z1tSN0","XWWSMI","mh5kP2","1hfsVK","j6FyUw","TrAQrl","QeTGbm","sSDydk","FTsptv","HFjctb","5D9yFR","yA5GSN","hGvWEL","NGM6jl","Bmvmco","ofNkFC","3DlGmX","zpg3Px","oM2VLh","2Tyl3W","rdPL1S","wqFlCB","dU0Pfe","3sCYUP","mwWueR","MUZiom","YkWV6U","YXYh4H","vpqa6A","PueEjT","lwwKMg","TmKO0i","KLWKJ4","4WsqnK","oxBe8t","Olcgih","qmLYih","0P7qHE","noX2jO"]}
+	{'name' : 'Shawn flairs',
+	 'author' : 'Shawn',
+	 'description' : 'Shawn flairs, based on <a href="http://www.fatcow.com/free-icons">Fatcow</a> collection',
+	 'def' : {"https://goo.gl/":["PnqzC9","piJJfN","8vJuw9","DR8Oc2","Wv9zi8","yA5GSN","iQ9oZ9","rKHNLj","CKaZTT","awfnMu","sJqHKL","444C8C","3P1a5y","1o6ogh","dXopJ1","zXVk9D","ymzgOI","UsjE4X","vA99pV","y8Y2el","OEEVLm","9rqBPS","WdyGBV","tSJKao","eaIbmD","gAmbRW","kFZv2X","TIaEI2","nSgtYG","KOGgNx","0P7qHE","cNSYXZ","CNuSm3  ","9HNC0Y","EgxuJi","Xh7qdD","BE3pcy","hNJw9n","aBw47V","q0dvOZ","M2fTuK","6esT27","6ETOlT","iJ7xvu","R7ze4S","fIE716","c94iEv","ofNkFC","dpTDr3","sSDydk","nAiwb9","R3YhPq","ZpNsgW","Cr2rGK","hGvWEL","LMh1Ex","dsUas5","bXAT7L","eqZ8Kg","JoPWPt","ATClCU","kFGuro","1hfsVK","42piMR","hwhiux","rSkFl6","yBL8D4","IFXuSY","p9k8X5","uUWHkY","cJrBE7","dbfOMD"]}
 	},
 	{'name' : 'Halloween flairs',
 	 'author' : 'Gregory Gambone',