Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed the search to photo issue by adding

$.mobile.pushStateEnabled = false;
  • Loading branch information...
commit 08a44a804f0cbe77316c39f9f99d7ddcedbc2f57 1 parent fc07147
Rainer Wittmann RainerAtSpirit authored

Showing 2 changed files with 27 additions and 2 deletions. Show diff stats Hide diff stats

  1. +23 0 app/app-build.js
  2. +4 2 index.html
23 app/app-build.js
... ... @@ -0,0 +1,23 @@
  1 +({
  2 + appDir: "./",
  3 + baseUrl: "./",
  4 + dir: "../release",
  5 + paths: {
  6 + 'backbone': 'libs/AMDbackbone-0.5.3',
  7 + 'underscore': 'libs/underscore-1.2.2',
  8 + 'jquery': 'libs/jQuery-1.7.1',
  9 + 'json2': 'libs/json2',
  10 + 'datepicker': 'libs/jQuery.ui.datepicker',
  11 + 'datepickermobile': 'libs/jquery.ui.datepicker.mobile',
  12 + 'jquerymobile': 'libs/jquery.mobile-1.0'
  13 + },
  14 + optimize: "uglify",
  15 + modules: [
  16 + {
  17 + name: "app",
  18 + exclude: [
  19 + // If you prefer not to include certain libs exclude them here
  20 + ]
  21 + }
  22 + ]
  23 +})
6 index.html
@@ -4,7 +4,7 @@
4 4 <head>
5 5 <meta charset="utf-8"/>
6 6 <title>Flickly</title>
7   - <link rel="stylesheet" media="all" href=""/>
  7 +
8 8 <link rel="shortcut" href="img/flickly.png">
9 9 <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.css"/>
10 10 <link rel="stylesheet" href="css/jquery.ui.datepicker.css"/>
@@ -12,6 +12,7 @@
12 12 <link rel="stylesheet" href="css/style.css"/>
13 13
14 14 <script type="text/javascript" src="app/libs/require-1.0.2.min.js"></script>
  15 + <!--<script type="text/javascript" src="release/app.js"></script>-->
15 16 <script type="text/javascript">
16 17 require.config( {
17 18 paths: {
@@ -39,6 +40,7 @@
39 40 (as opposed to urlHistory.listeningEnabled, which is an internal toggle)
40 41 */
41 42 $.mobile.hashListeningEnabled = false;
  43 + $.mobile.pushStateEnabled = false;
42 44 $.mobile.page.prototype.options.degradeInputs.date = true;
43 45 //$.mobile.page.prototype.options.addBackBtn = true;
44 46 $( '#date-min, #date-max' ).datepicker();
@@ -313,7 +315,7 @@ <h1 class="app-title">Flickly</h1>
313 315
314 316 <div data-role="footer" data-position="fixed">
315 317 <div data-role="navbar">
316   - <ul><a href="." class="ui-btn-active" data-ajax="false" class="ui-btn-right" data-direction="reverse">New
  318 + <ul><a href="/" class="ui-btn-active" data-ajax="false" class="ui-btn-right" data-direction="reverse">New
317 319 Search</a></ul>
318 320 </div>
319 321 </div>

0 comments on commit 08a44a8

Please sign in to comment.
Something went wrong with that request. Please try again.