wassname/HackFlowy
1
0
Fork 0
mirror of https://github.com/wassname/HackFlowy.git synced 2026-09-09 11:14:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

More misc improvements. Cursor Logic, Screen Width, consoleLogs--, Heroku Renaming

Browse Source
This commit is contained in:
Curtis SerVaas
2014-10-11 09:50:32 -04:00
parent a90d168612
commit 3dabfe79fd
13 changed files with 246 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/backbone/router.js
+5 -5
View File
@@ -26,7 +26,7 @@ var AppRouter = Backbone.Router.extend({
complete: function(){
},
success: function(data){
console.log("AjaxLoginDATA");
// console.log("AjaxLoginDATA");
if(typeof data == "string"){
$("textarea").attr("disabled", true);
} //User is not logged in.
@@ -40,8 +40,8 @@ var AppRouter = Backbone.Router.extend({
data.google.email = null;
CurrentUser = data;
console.log("CURRENT USER");
console.log(CurrentUser);
// console.log("CURRENT USER");
// console.log(CurrentUser);
}
},
@@ -98,7 +98,7 @@ setUpSocket: function(){
var that = this;
socket.emitWrapper = function(eventName, data){
console.log(this);
// console.log(this);
if(this.socket.connected){
if(eventName=="newNode" || eventName=="movedNode" || eventName=="removeNode"){
var oldTime = CURRENT_TIMESTAMP;
@@ -116,7 +116,7 @@ socket.emitWrapper = function(eventName, data){
socket.on('nodeData', function(data, SERVER_TIMESTAMP){
//alert("data");
CURRENT_TIMESTAMP = SERVER_TIMESTAMP;
console.log(data);
// console.log(data);
nodesCollection = new NodesCollection(data);
var id = nodesCollection.findWhere({text: "0root"}).get("_id");
// if(otherID){
public/js/backbone/views/listView.js
+1
View File
@@ -103,6 +103,7 @@ var listView = Backbone.View.extend({
that.childViews.insert(index , newView);
cur = true;
if(cur){
if(vo.cursorHack){ return newView; }
newLI.children().children("textarea").focus();
}
else{
public/js/backbone/views/showView.js
+7 -7
View File
@@ -45,7 +45,7 @@ var showView = Backbone.View.extend({
that.$el.children().children("textarea").prop("disabled", true);
that.$el.addClass("snapLI");
}
console.log("about to render textarea")
// console.log("about to render textarea")
that.renderChildren();
@@ -73,12 +73,12 @@ var showView = Backbone.View.extend({
alert("bleh");
},
//Moved to app.js to handle bubbling issues.
// collapse: function(){
// var that = this;
// that.$el.children("ul").slideToggle(110);
// that.$el.children(".zoomButton").toggleClass("collapsed");
// },
// Moved to app.js to handle bubbling issues.
collapse: function(){
var that = this;
that.$el.children("ul").slideToggle(110);
that.$el.children(".zoomButton").toggleClass("collapsed");
},
createUIBullet: function( id , text, depth) {
var that = this;