mirror of
https://bitbucket.org/vendoo/vendoo_v1.0.git
synced 2025-12-25 03:37:39 +00:00
Merged branch BUG-Cancel-Button-does-not-work-on-the-edit-image-posting-screen into master
This commit is contained in:
commit
8a616052d9
Binary file not shown.
@ -10,11 +10,11 @@
|
|||||||
ignoreCount = "0"
|
ignoreCount = "0"
|
||||||
continueAfterRunningActions = "No"
|
continueAfterRunningActions = "No"
|
||||||
filePath = "Vendoo/ListingPreviewViewController.swift"
|
filePath = "Vendoo/ListingPreviewViewController.swift"
|
||||||
timestampString = "501292645.293697"
|
timestampString = "501865709.047213"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "617"
|
startingLineNumber = "629"
|
||||||
endingLineNumber = "617"
|
endingLineNumber = "629"
|
||||||
landmarkName = "publishItem(_:)"
|
landmarkName = "publishItem(_:)"
|
||||||
landmarkType = "5">
|
landmarkType = "5">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
@ -186,7 +186,7 @@
|
|||||||
moduleName = "Vendoo"
|
moduleName = "Vendoo"
|
||||||
usesParentBreakpointCondition = "Yes"
|
usesParentBreakpointCondition = "Yes"
|
||||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/CategoriesTableViewController.swift"
|
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/CategoriesTableViewController.swift"
|
||||||
timestampString = "501438723.320631"
|
timestampString = "501863904.741449"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "570"
|
startingLineNumber = "570"
|
||||||
@ -201,7 +201,7 @@
|
|||||||
moduleName = "Vendoo"
|
moduleName = "Vendoo"
|
||||||
usesParentBreakpointCondition = "Yes"
|
usesParentBreakpointCondition = "Yes"
|
||||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/CategoriesTableViewController.swift"
|
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/CategoriesTableViewController.swift"
|
||||||
timestampString = "501438723.320746"
|
timestampString = "501863904.74155"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "572"
|
startingLineNumber = "572"
|
||||||
@ -744,7 +744,7 @@
|
|||||||
moduleName = "Vendoo"
|
moduleName = "Vendoo"
|
||||||
usesParentBreakpointCondition = "Yes"
|
usesParentBreakpointCondition = "Yes"
|
||||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/SettingsViewController.swift"
|
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/SettingsViewController.swift"
|
||||||
timestampString = "501438723.339454"
|
timestampString = "501863904.765008"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "194"
|
startingLineNumber = "194"
|
||||||
@ -759,7 +759,7 @@
|
|||||||
moduleName = "Vendoo"
|
moduleName = "Vendoo"
|
||||||
usesParentBreakpointCondition = "Yes"
|
usesParentBreakpointCondition = "Yes"
|
||||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/SettingsViewController.swift"
|
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/SettingsViewController.swift"
|
||||||
timestampString = "501438723.339576"
|
timestampString = "501863904.765171"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "197"
|
startingLineNumber = "197"
|
||||||
@ -785,5 +785,101 @@
|
|||||||
landmarkType = "5">
|
landmarkType = "5">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
</BreakpointProxy>
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
shouldBeEnabled = "No"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Vendoo/ItemImagePickerViewController.swift"
|
||||||
|
timestampString = "501823514.544138"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "519"
|
||||||
|
endingLineNumber = "519"
|
||||||
|
landmarkName = "ItemImagePickerViewController"
|
||||||
|
landmarkType = "3">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
shouldBeEnabled = "No"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Vendoo/ItemImagePickerViewController.swift"
|
||||||
|
timestampString = "501824216.856573"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "92"
|
||||||
|
endingLineNumber = "92"
|
||||||
|
landmarkName = "ItemImagePickerViewController"
|
||||||
|
landmarkType = "3">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Vendoo/ItemImagePickerViewController.swift"
|
||||||
|
timestampString = "501824224.47075"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "93"
|
||||||
|
endingLineNumber = "93"
|
||||||
|
landmarkName = "toggleEditingMode(_:)"
|
||||||
|
landmarkType = "5">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Vendoo/ItemImagePickerViewController.swift"
|
||||||
|
timestampString = "501824288.668123"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "167"
|
||||||
|
endingLineNumber = "167"
|
||||||
|
landmarkName = "prepareForSegue(_:sender:)"
|
||||||
|
landmarkType = "5">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Vendoo/ItemImagePickerViewController.swift"
|
||||||
|
timestampString = "501863821.46129"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "520"
|
||||||
|
endingLineNumber = "520"
|
||||||
|
landmarkName = "cancelNewListing(_:)"
|
||||||
|
landmarkType = "5">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
|
<BreakpointProxy
|
||||||
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
|
<BreakpointContent
|
||||||
|
shouldBeEnabled = "Yes"
|
||||||
|
ignoreCount = "0"
|
||||||
|
continueAfterRunningActions = "No"
|
||||||
|
filePath = "Vendoo/ListingPreviewViewController.swift"
|
||||||
|
timestampString = "501865709.047213"
|
||||||
|
startingColumnNumber = "9223372036854775807"
|
||||||
|
endingColumnNumber = "9223372036854775807"
|
||||||
|
startingLineNumber = "243"
|
||||||
|
endingLineNumber = "243"
|
||||||
|
landmarkName = "cancel(_:)"
|
||||||
|
landmarkType = "5">
|
||||||
|
</BreakpointContent>
|
||||||
|
</BreakpointProxy>
|
||||||
</Breakpoints>
|
</Breakpoints>
|
||||||
</Bucket>
|
</Bucket>
|
||||||
|
|||||||
@ -68,10 +68,22 @@ class ListingPreviewViewController: UIViewController {
|
|||||||
/*if(!self.networksDictionary["areNetworksChosen"]!) {
|
/*if(!self.networksDictionary["areNetworksChosen"]!) {
|
||||||
self.networks.hidden = true
|
self.networks.hidden = true
|
||||||
}*/
|
}*/
|
||||||
/*else if (self.itemViewState == "Editable") {
|
else if (self.itemViewState == "Editible") {
|
||||||
//self.cancel_backBtn.titleLabel?.text = "Back"
|
//self.cancel_backBtn.titleLabel?.text = "Back"
|
||||||
|
if(
|
||||||
}*/
|
self.itemTitle.text == "" ||
|
||||||
|
self.itemDescription.text == "" ||
|
||||||
|
self.itemPrice.text == "" ||
|
||||||
|
self.itemCategory.text == "" ||
|
||||||
|
self.itemQuantity == nil ||
|
||||||
|
self.itemPictureMain.image == nil ||
|
||||||
|
self.networks.numberOfItemsInSection(0) == 0
|
||||||
|
){
|
||||||
|
|
||||||
|
self.publishBtn.hidden = true
|
||||||
|
self.publishBtn.enabled = false
|
||||||
|
}
|
||||||
|
}
|
||||||
// Do any additional setup after loading the view.
|
// Do any additional setup after loading the view.
|
||||||
|
|
||||||
// Initialization code
|
// Initialization code
|
||||||
@ -233,7 +245,7 @@ extension ListingPreviewViewController {
|
|||||||
let vc = storyboard.instantiateViewControllerWithIdentifier("Reveal View Controller") as! SWRevealViewController
|
let vc = storyboard.instantiateViewControllerWithIdentifier("Reveal View Controller") as! SWRevealViewController
|
||||||
self.presentViewController(vc, animated: true, completion: nil)
|
self.presentViewController(vc, animated: true, completion: nil)
|
||||||
}
|
}
|
||||||
else if self.itemViewState == "Editable" || self.itemViewState == "NonEditable"{
|
else if self.itemViewState == "Editible" || self.itemViewState == "NonEditable"{
|
||||||
self.presentingViewController?.dismissViewControllerAnimated(true, completion: nil)
|
self.presentingViewController?.dismissViewControllerAnimated(true, completion: nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user