Fixed render issue general

raDiesle · Apr 22, 2012 · 103296d · 103296d
1 parent 055272a
commit 103296d
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 50 deletions.
diff --git a/_attachments/ApplicationScope.js b/_attachments/ApplicationScope.js
@@ -27,7 +27,7 @@ var adventurio = adventurio || {
     		Login: {},
     		Signup : {},
     		Stories: {},
-    		Story : {},
+    		Story : {singleton : {}},
     		CreateStory : {}
     	},
     	reader : {

diff --git a/_attachments/css/style.css b/_attachments/css/style.css
@@ -1,7 +1,3 @@
-.ok_button {
-
-}
-
 .reader_index_content {
 	background-image: url('../images/dragon_03.jpg');
 	background-repeat: no-repeat;

diff --git a/_attachments/index.html b/_attachments/index.html
@@ -236,31 +236,16 @@ <h2>Login</h2>
 
 <!--  Creator: Manage Story Menu -->
 <div data-role="page" id="creator_stories_storyid"   data-url="#whatever" data-position="inline" >
-			<div data-role="header" class="header">
-				<h2 class="title">Manage Story</h2>
-			</div>
-			<div data-role="content" class="reader_index_content" data-identity="{{storyId}}" >
-				<div class="creator_index_content">
-					<div class="ui-grid-a"  >
-						<div class="ui-block-a" >
-							content 123
-						</div>
-						<ul data-role="listview" data-theme="g" class="ui-block-b transparent" data-inset="true">
-						</ul>
-
-					</div>
-				</div>
-			</div>
-					<form>
-<!-- 						<label for="slider-0">Built Story: </label> -->
-				<input type="range" name="slider" id="slider-0" value="60" min="0" max="100" highlight="true" step="2"  />
-						</form>
-
-			<div data-role="footer">
-				Footer
-
-			</div>
-		</div>
+	<div data-role="header" class="header">
+		<h2 class="title">Manage Story</h2>
+	</div>
+	<div data-role="content" >
+		<!-- template_menus_simple -->
+	</div>
+	<div data-role="footer">
+		Footer
+	</div>
+</div>
 
 
 <!--CREATOR:  Own Stories List -->

diff --git a/_attachments/src/adventurio/routers/MainRouter.js b/_attachments/src/adventurio/routers/MainRouter.js
@@ -94,7 +94,8 @@ adventurio.routers.MainRouter = Backbone.Router.extend({
 		var newModel = new adventurio.models.StoryModel({
 			'_id' : storyId
 		});
-		new adventurio.views.creator.Story({
+
+		adventurio.views.creator.Story.singleton = new adventurio.views.creator.Story({
 			model : newModel
 		});
 	},

diff --git a/_attachments/src/adventurio/views/creator/ManageStory.js b/_attachments/src/adventurio/views/creator/ManageStory.js
@@ -4,7 +4,6 @@ adventurio.views.creator.ManageStory = adventurio.views.superClasses.Basic.exten
 		$().ready($.proxy(this.render, this));
 	},
 	events : {
-		// "click a" : "redirectPage"
 	},
 	render : function() {
 		var context = {
@@ -27,8 +26,4 @@ adventurio.views.creator.ManageStory = adventurio.views.superClasses.Basic.exten
 		};
 		this._super("render", [adventurio.templates.menus.Simple.compile(context), "manage title"]);
 	}
-	// ,redirectPage : function(event) {
-		// var dataUrl = $(event.currentTarget).attr("data-identity");
-		// adventurio.routers.MainRouter.singleton.navigate(dataUrl, {trigger: true});
-	// }
 });
diff --git a/_attachments/src/adventurio/views/creator/Story.js b/_attachments/src/adventurio/views/creator/Story.js
@@ -7,10 +7,6 @@ adventurio.views.creator.Story = adventurio.views.superClasses.Basic.extend({
 	render : function() {
 		this._super("render", [adventurio.templates.creator.Story.compile(this.model.toJSON()), this.model.get("name")]);
 	},
-	renderTemplate : function(htmlContent, headerTitle){
-		$('[data-role="content"]', this.el).html(htmlContent).trigger("create");
-		$('h1', this.el).text(headerTitle);
-	},
 	events : {
 		"click .submitButton" : "editStory",
 	},

diff --git a/_attachments/src/adventurio/views/superClasses/Basic.js b/_attachments/src/adventurio/views/superClasses/Basic.js
@@ -3,31 +3,37 @@ adventurio.views.superClasses.Basic = Backbone.View.extend({
 		options = options || {};
 		var role = typeof options['role'] == 'undefined' ? "page" : options['role']; 
 
-		$content = $('[data-role="content"]', this.el)
+		$content = $('[data-role="content"]', this.el);
 		$content.html(htmlContent);
 
-
+		var firstTimeRendered = !$content.hasClass('ui-content');
+
 		$('h1', this.el).text(headerTitle);
 		$.mobile.changePage("#"+this.el.id, {
 			transition : 'slideup',
 			reverse : false,
 			changeHash : false,
 			role : role
+			 // ,reloadPage : true
 		});
+
+		if(!firstTimeRendered){
+			$content.trigger("create");
+		}
 
+		 // var $listview = $("ul", $content); // .first()
+		 // var wasAlreadyRenderedByJQM = $listview.hasClass('ui-listview') 
+		 // if (!wasAlreadyRenderedByJQM) {
+			        // $listview.listview();
+	    // }
+
 		// var hasListview = typeof options['hasListview'] == 'undefined' ? false : options['hasListview'];
 		// if(hasListview){
-			 var $listview = $("ul", $content); // .first()
-			 var wasAlreadyRenderedByJQM = $listview.hasClass('ui-listview') 
 			 // $listview.hasClass('ui-block-b') || || $listview.hasClass(".ui-body-c")
-			 if (!wasAlreadyRenderedByJQM) {
-				 	// try{
-				        $listview.listview();
+				 	// try{
 				        // $listview.listview('refresh');
 				 	// }catch(ExceptionHackForBackButton){ /*do nothing*/}
 				  // });
-		        // this.el.trigger('create');
-		    }
-		console.log("end");
+		        // this.el.trigger('create');
 	}
 });