Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/jumpbytehq/backbone-jqmobile
Browse files Browse the repository at this point in the history
  • Loading branch information
Dhaval Nagar authored and Dhaval Nagar committed Sep 18, 2012
2 parents e9e1c3a + ca4fee9 commit 45b155e
Show file tree
Hide file tree
Showing 2 changed files with 148 additions and 5 deletions.
151 changes: 147 additions & 4 deletions backbon-jqmobile.tmproj
View file
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>currentDocument</key>
<string>src/widget.js</string>
<string>src/fragment.js</string>
<key>documents</key>
<array>
<dict>
Expand All @@ -16,6 +16,12 @@
<key>sourceDirectory</key>
<string></string>
</dict>
<dict>
<key>filename</key>
<string>src/component.json</string>
<key>lastUsed</key>
<date>2012-09-15T11:51:37Z</date>
</dict>
</array>
<key>fileHierarchyDrawerWidth</key>
<integer>200</integer>
Expand All @@ -35,6 +41,34 @@
<key>firstVisibleLine</key>
<integer>216</integer>
</dict>
<key>examples/restaurant/apps/survey/app.html</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>examples/restaurant/data/menu.json</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>20</integer>
<key>line</key>
<integer>8</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>examples/restaurant/templates/menu-list.html</key>
<dict>
<key>caret</key>
Expand Down Expand Up @@ -79,6 +113,34 @@
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>src/block.js</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>78</integer>
<key>line</key>
<integer>21</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>14</integer>
</dict>
<key>src/component.json</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>1</integer>
<key>line</key>
<integer>9</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>src/core.js</key>
<dict>
<key>caret</key>
Expand All @@ -98,9 +160,23 @@
<key>caret</key>
<dict>
<key>column</key>
<integer>24</integer>
<integer>92</integer>
<key>line</key>
<integer>23</integer>
<integer>16</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>src/template.js</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>20</integer>
<key>line</key>
<integer>18</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
Expand Down Expand Up @@ -149,6 +225,66 @@
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>test/simple/app.js</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>27</integer>
<key>line</key>
<integer>64</integer>
</dict>
<key>columnSelection</key>
<false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>38</integer>
<key>selectFrom</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>selectTo</key>
<dict>
<key>column</key>
<integer>3</integer>
<key>line</key>
<integer>84</integer>
</dict>
</dict>
<key>test/simple/index.html</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>8</integer>
<key>line</key>
<integer>48</integer>
</dict>
<key>columnSelection</key>
<false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>4</integer>
<key>selectFrom</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>42</integer>
</dict>
<key>selectTo</key>
<dict>
<key>column</key>
<integer>8</integer>
<key>line</key>
<integer>48</integer>
</dict>
</dict>
<key>test/widget/app.js</key>
<dict>
<key>caret</key>
Expand Down Expand Up @@ -182,16 +318,23 @@
<array>
<string>test/widget/app.js</string>
<string>src/widget.js</string>
<string>src/component.json</string>
<string>test/simple/index.html</string>
<string>test/simple/app.js</string>
<string>examples/restaurant/apps/survey/app.html</string>
<string>src/block.js</string>
<string>examples/restaurant/data/menu.json</string>
<string>src/core.js</string>
<string>test/widget/index.html</string>
<string>examples/restaurant/app.js</string>
<string>src/fragment.js</string>
<string>src/template.js</string>
<string>examples/restaurant/templates/menu-page.html</string>
<string>examples/restaurant/templates/menu-list.html</string>
</array>
<key>showFileHierarchyDrawer</key>
<true/>
<key>windowFrame</key>
<string>{{0, 0}, {1230, 878}}</string>
<string>{{0, 4}, {1230, 874}}</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion src/fragment.js
View file
Expand Up @@ -14,7 +14,7 @@ jumpui.Fragment = jumpui.internal.AbstractView.extend({
//this.setElement(this.make(this.tagName, this.attributes));
//var $el = $(this.el);
if($.isFunction(this.template)) {
this.$el.append(this.block.page.app.templateEngine.parseHtml(this.template(this.model), this.getModel()));
this.$el.append(this.block.page.app.templateEngine.parseHtml(this.template(this.getModel()), this.getModel()));
return;
} else if(this.template!=undefined) {
this.$el.append(this.block.page.app.templateEngine.parse(this.template, this.getModel()));
Expand Down

0 comments on commit 45b155e

Please sign in to comment.