Skip to content

Commit

Permalink
#4 Refactoring naming
Browse files Browse the repository at this point in the history
  • Loading branch information
eysteinbye committed Mar 12, 2014
1 parent f14750b commit b53dd9d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ em {
}

/* Chat */
#messagesDiv {
#outputDiv {
background-color: white;
overflow: auto;
height: 230px;
Expand Down
20 changes: 10 additions & 10 deletions index.htm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<html data-ng-app="showMe">
<head>
<title>ShowMe</title>
<title>ShowMe!</title>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.1.5/angular.min.js"></script>
<script src="https://cdn.firebase.com/v0/firebase.js"></script>
<script src="https://cdn.firebase.com/v0/firebase-simple-login.js"></script>
Expand All @@ -10,43 +10,43 @@
<link rel="stylesheet" type="text/css" href="css/style.css">
</head>
<body data-ng-controller="SaveController">
<h1>ShowMe.</h1>
<h1>ShowMe!</h1>

<span data-ng-show="user">
{{user.name}} | <a data-ng-click="logout()">Logout</a>
</span>

<div data-ng-show="user">
<div data-ng-show="user" id="outputDiv">
<div data-ng-repeat="product in products"><em>{{product.name}}</em>: {{product.desc}}-{{product.product}}</div>
</div>

<label>
Description
<input data-ng-show="user" type="text" data-ng-model="desc" data-ng-keydown="addMessage($event)" placeholder="Description...">
<input data-ng-show="user" type="text" data-ng-model="desc" data-ng-keydown="addProduct($event)" placeholder="Description...">
</label><br />
<label>
Product name
<input data-ng-show="user" type="text" data-ng-model="product" data-ng-keydown="addMessage($event)" placeholder="Product name...">
<input data-ng-show="user" type="text" data-ng-model="product" data-ng-keydown="addProduct($event)" placeholder="Product name...">
</label><br />
<label>
Time
<input data-ng-show="user" type="text" data-ng-model="startTime" data-ng-keydown="addMessage($event)" placeholder="Time...">
<input data-ng-show="user" type="text" data-ng-model="startTime" data-ng-keydown="addProduct($event)" placeholder="Time...">
</label><br />
<label>
ShowID
<input data-ng-show="user" type="text" data-ng-model="showId" data-ng-keydown="addMessage($event)" placeholder="ShowID...">
<input data-ng-show="user" type="text" data-ng-model="showId" data-ng-keydown="addProduct($event)" placeholder="ShowID...">
</label><br />
<label>
Code
<input data-ng-show="user" type="text" data-ng-model="code" data-ng-keydown="addMessage($event)" placeholder="Code...">
<input data-ng-show="user" type="text" data-ng-model="code" data-ng-keydown="addProduct($event)" placeholder="Code...">
</label><br />
<label>
CodeType
<input data-ng-show="user" type="text" data-ng-model="codeType" data-ng-keydown="addMessage($event)" placeholder="CodeType...">
<input data-ng-show="user" type="text" data-ng-model="codeType" data-ng-keydown="addProduct($event)" placeholder="CodeType...">
</label><br />
<label>
Image
<input data-ng-show="user" type="text" data-ng-model="imageUrl" data-ng-keydown="addMessage($event)" placeholder="Image">
<input data-ng-show="user" type="text" data-ng-model="imageUrl" data-ng-keydown="addProduct($event)" placeholder="Image">
</label>

<span data-ng-hide="user">
Expand Down
9 changes: 7 additions & 2 deletions js/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function SaveController($scope, angularFire, angularFireAuth) {

$scope.products = [];

$scope.addMessage = function(e) {
$scope.addProduct = function(e) {
if (e.keyCode != 13) return;

$scope.products.push({
Expand All @@ -23,8 +23,13 @@ function SaveController($scope, angularFire, angularFireAuth) {
desc: $scope.desc
});

$scope.desc = "";
$scope.product = "";
$scope.startTime = "";
$scope.showId = "";
$scope.code = "";
$scope.codeType = "";
$scope.imageUrl = "";
$scope.desc = "";
};

$scope.loginFacebook = function () {
Expand Down

0 comments on commit b53dd9d

Please sign in to comment.