social_cheesecake 0.4.0 → 0.5.0

data/app/assets/javascripts/socialcheesecake/subsector.js

@@ -1,7 +1,8 @@
 var socialCheesecake = socialCheesecake || {};
 (function() {
 	socialCheesecake.Subsector = function(settings) {
-		this.id = settings.id || null;
+		this.id = null;
+		if(settings.id != undefined ) this.id = settings.id;
 		if(settings.parent != null) this.parent = settings.parent;		
 		this.label = "";
 		if(settings.label != null) this.label = settings.label;
@@ -15,7 +16,7 @@ var socialCheesecake = socialCheesecake || {};
 		this.auxiliar = (settings.auxiliar) ? settings.auxiliar : false;
 		this.type = (settings.type) ? settings.type : "normalSubsector";
 		if(settings.simulate != null) this.simulate = settings.simulate;
-		if(settings.color) this.color = settings.color;
+		this.color = settings.color || socialCheesecake.colors.normalSubsector.background;
 		if(settings.fontColor) this.fontColor = settings.fontColor;
 		if(settings.borderColor) this.borderColor = settings.borderColor;
 		if(settings.click != null) this.click = settings.click;
@@ -78,6 +79,19 @@ var socialCheesecake = socialCheesecake || {};
 		return subsector.parent.parent;
 	}
 	
+	/*
+	 * Returns the subsector's index IN SOCIALCHEESECAKE
+	 */
+	socialCheesecake.Subsector.prototype.getIndex = function(){
+		var subsector = this;
+		var sector = subsector.parent;
+		var index = null;
+		for(var i in sector.subsectors){
+			if(sector.subsectors[i] === subsector ) index = i;
+		}
+		return index;
+	}
+	
 	socialCheesecake.Subsector.prototype.removeActor = function(actor){
 		var actors = this.actors;
 		var actorParents;

data/app/assets/javascripts/socialcheesecake/text.js

@@ -59,6 +59,19 @@ var socialCheesecake = socialCheesecake || {};
 		},
 		writeCenterText : function(text, context, centerX, centerY) {
 			context.fillText(text, centerX - context.measureText(text).width / 2, centerY);
+		},
+		getTextHeight : function(text, style){
+			var style = style || socialCheesecake.text.style;
+			var div = document.createElement('div');
+			var height = 0;
+			div.setAttribute('id','getTextHeight');
+			div.setAttribute('display','none');
+			div.setAttribute('style', 'font: '+style);
+			div.innerHTML = text;
+			document.body.appendChild(div);
+			height = parseInt(window.getComputedStyle(div).fontSize);
+			document.body.removeChild(div);
+			return height;
 		}
 	}
 })();

data/lib/social_cheesecake/version.rb

@@ -1,3 +1,3 @@
 module SocialCheesecake
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/test/dummy/app/assets/javascripts/main.js

@@ -3,7 +3,6 @@ window.requestAnimFrame = (function(callback) {
 	function(callback) {
 		window.setTimeout(callback, 1000 / 60);
 	};
-
 })();
 var sectorsCounter = 0;
 var subsectorsCounter = [0];
@@ -19,8 +18,33 @@ var cheesecakeData = {
 		id : "grid",
 		divIdPrefix : "actor_"
 	},
-	onChange : function() {
-		console.log("Cambio detectado");
+	callbacks : {
+		onChange : function() {
+			console.log("Cambio detectado");
+		},
+		onSubsectorAddedBegin : function(subsector){
+			console.log("New subsector is going to be added.");
+			console.log(subsector);
+		},
+		onSubsectorAddedEnd : function(subsector){
+			console.log("New subsector "+ subsector.getIndex() +" added in sector "+subsector.parent.getIndex());
+			console.log(subsector.getCheesecake());
+		},
+		onSectorHighlight : function(){
+			console.log("sector HIGHLIGHTED");
+		},
+		onSectorFocusBegin : function(){
+			console.log("going to FOCUS sector ");
+		},
+		onSectorFocusEnd : function(){
+			console.log("sector FOCUSED");
+		},
+		onSectorUnfocusBegin : function(){
+			console.log("going to UNFOCUS sector");
+		},
+		onSectorUnfocusEnd : function(sector){
+			console.log("sector UNFOCUSED");
+		}
 	},
 	text : {
 		newStyle : "bold italic 14px sans-serif"
@@ -123,7 +147,8 @@ function createCheese() {
 		}
 		var sector = {
 			name : $("#label_s" + i).val(),
-			subsectors : subsectors
+			subsectors : subsectors,
+			id : i
 		};
 		sectors.push(sector);
 	}
@@ -137,12 +162,19 @@ function createCheese() {
 	if(cheese)
 		deleteCheese();
 	cheese = new socialCheesecake.Cheesecake(cheesecakeData);
+	$('.actor').css('display','none');
+	cheese.grid.showAll();
 }
 
 function deleteCheese() {
 	$('canvas').detach();
 	cheese.grid.hideAll();
 	cheese = 0;
+	var clone = $("#cheesecake").clone();
+	clone.attr("id","cheesecake2");
+	$("#cheesecake").after(clone);
+	$("#cheesecake").remove();
+	clone.attr("id","cheesecake");
 }
 
 function randomName() {

data/test/dummy/app/assets/stylesheets/style.css

@@ -116,6 +116,15 @@ canvas {
   margin: 1px;
   opacity: 1;
 }
+#grid .actor.selected {
+  border: 2px solid #8E846B;
+  background-color: #ffe481;
+  margin: 1px;
+  opacity: 1;
+}
+#grid .actor.orphan {
+  border: 2px solid #BD1823 !important;
+}
 #grid .actor img {
   width: 64px;
   height: 64px;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_cheesecake
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - "Alicia D\xC3\xADez"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-27 00:00:00 Z
+date: 2012-05-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: railties