From fbb202c4cd70ea9d06cbaddd96771bb68e2d2af1 Mon Sep 17 00:00:00 2001
From: Kevin Mach <kjmach@ucsd.edu>
Date: Wed, 3 Jun 2015 10:37:21 -0700
Subject: [PATCH] made a few changes for edit
---
scripts/FlashcardDirective.js | 4 ++--
scripts/FlashcardFactory.js | 21 ++++++++++++---------
templates/flashcard.html | 33 +++++++++++++++++----------------
3 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/scripts/FlashcardDirective.js b/scripts/FlashcardDirective.js
index 43c775c..93a0616 100644
--- a/scripts/FlashcardDirective.js
+++ b/scripts/FlashcardDirective.js
@@ -13,10 +13,10 @@ angular.module('flashy.FlashcardDirective', []).
},
colNum: 0,
colRank: 0,
- link: function(scope, element) {
+ /*link: function(scope, element) {
$('.tooltipped').tooltip();
// /* Handles width of the card */
- }
+ //}
};
}
diff --git a/scripts/FlashcardFactory.js b/scripts/FlashcardFactory.js
index 8ae4ac9..018c936 100644
--- a/scripts/FlashcardFactory.js
+++ b/scripts/FlashcardFactory.js
@@ -59,8 +59,6 @@ angular.module('flashy.FlashcardFactory', ['ui.router']).
var editableText = this.formatted_text;
- //$('#flashcardEditText').html(this.formatted_text);
-
$('.modal-trigger').leanModal({
dismissible: true, // Modal can be dismissed by clicking outside of the modal
opacity: .5, // Opacity of modal background
@@ -71,7 +69,6 @@ angular.module('flashy.FlashcardFactory', ['ui.router']).
$('#edit-card-input').html(editableText);
-
}, // Callback for Modal open
complete: function () {
@@ -86,12 +83,8 @@ angular.module('flashy.FlashcardFactory', ['ui.router']).
Flashcard.prototype.refreshEditCardInput = function () {
- console.log("ASDFASDFASDFASFD");
-
-
this.editCardText = $('#edit-card-input').text();
-
this.submit_enabled = this.editCardText.length >= 5 && this.editCardText.length <= 160;
@@ -145,7 +138,10 @@ angular.module('flashy.FlashcardFactory', ['ui.router']).
};
if (myCard.text == '') {
console.log('blank flashcard not pushed:' + myCard.text);
- return closeNewCard();
+ //return closeNewCard();
+
+ $('#editModal').closeModal(modal_options);
+
}
$http.patch('/api/flashcards/' + this.id, myCard).
success(function (data) {
@@ -154,11 +150,18 @@ angular.module('flashy.FlashcardFactory', ['ui.router']).
Materialize.toast("<p>Thanks for contributing! However, others won't see your card until you verify your email address<p>", 4000);
}
});
- //return .closeNewCardModal();
+
+ $('#editModal').closeModal(modal_options);
}
+ Flashcard.prototype.discardChanges = function() {
+
+ $('#editModal').closeModal(modal_options);
+
+ }
+
return Flashcard;
});
diff --git a/templates/flashcard.html b/templates/flashcard.html
index 6c26712..ab3dce9 100644
--- a/templates/flashcard.html
+++ b/templates/flashcard.html
@@ -21,13 +21,11 @@
<div class="bottom-box no-user-select">
- <div class="left-box tooltipped" data-position=" bottom" data-tooltip="Info">
+ <div class="left-box tooltipped" data-position=" bottom" data-tooltip="Edit">
<div class="center-me modal-trigger" href="#editModal" ng-click="flashcard.edit()"><i class="mdi-editor-border-color small"></i></div>
</div>
-
-
<div class="right-box tooltipped" ng-click="flashcard.hide()" data-position="bottom" data-tooltip="Hide">
<div class="center-me"><i class="mdi-action-delete small"></i></div>
</div>
@@ -36,17 +34,7 @@
</div>
- <!--<div id="editModal" class="modal">
- <div class="modal-content">
- <h4 id="flashcardEditText"></h4>
- </div>
- <div class="modal-footer">
-
- </div>
- </div>-->
-
-
-
+ <!-- Edit Modal -->
<div id="editModal" class="modal row" style="max-height:none;">
<form id="edit-card-form">
<div class="modal-content col">
@@ -71,15 +59,28 @@
data-delay="50" ng-class="flashcard.submit_enabled?{}:'disabled'"
data-tooltip="Enter">
Edit
- <i class="mdi-hardware-keyboard-return right"></i>
+ <i class="mdi-action-done right"></i>
</button>
</div>
+
+
<div class="row">
+ <button class="btn modal-close" ng-click="flashcard.discardChanges()"
+ data-position="left"
+ data-delay="50">
+ Discard Changes
+ <i class="mdi-content-clear right"></i>
+ </button>
+ </div>
+
+ <!--<div class="row">
<button id="blank-selected" style="float:left" class="btn tooltipped" data-position="right" data-delay="50"
data-tooltip="Ctrl-B">
Blank Selected Text
</button>
- </div>
+ </div>-->
+
+
<div class="row" ng-show="flashcard.editCardText" ng-style="(flashcard.editCardText.length>160)?{color:'red'}:{}">
{{flashcard.editCardText.length}}/160 characters
</div>
--
1.9.1