Created
June 8, 2015 20:31
-
-
Save lorenjohnson/816d4cab4ee6156600bf to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --cc app/views/steps/edit.html.erb | |
index 346c97b,9b320ba..0000000 | |
--- a/app/views/steps/edit.html.erb | |
+++ b/app/views/steps/edit.html.erb | |
diff --git a/app/assets/javascripts/angular/c-edit-steps.js b/app/assets/javascripts/angular/c-edit-steps.js | |
index fd5cfd9..a39fd95 100644 | |
--- a/app/assets/javascripts/angular/c-edit-steps.js | |
+++ b/app/assets/javascripts/angular/c-edit-steps.js | |
@@ -1,8 +1,8 @@ | |
'use strict'; | |
// view posts (steps) controller | |
// for editing and deleting posts: | |
-makerSpaceApp.controller('EditStepsCtrl', ['$scope', '$http', 'flowFactory', | |
- function ($scope, $http, flowFactory) { | |
+makerSpaceApp.controller('EditStepsCtrl', ['$scope', '$http', | |
+ function ($scope, $http) { | |
$scope.editPost = {}; | |
var xhrUrl; | |
$scope.editPost.init = function(stepId, title, body, postUrl, projUrl){ | |
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb | |
index ab0060e..2b5d1f1 100644 | |
--- a/app/views/layouts/application.html.erb | |
+++ b/app/views/layouts/application.html.erb | |
@@ -69,7 +69,7 @@ | |
</script> | |
<script type="text/ng-template" id="flow-uploader.html"> | |
- <div flow-init flow-object="flowUploader" flow-files-submitted="$flow.upload()" flow-file-success="imgUploaded()"> | |
+ <div flow-init flow-object="flowUploader" flow-files-submitted="uploadImage($flow)" flow-file-success="imgUploaded($flow)"> | |
<!-- Initial img: --> | |
<img ng-show="existingImage" | |
ng-src="{{existingImage}}" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment