Skip to content

Commit

Permalink
Merge pull request #45 from hklemp/master
Browse files Browse the repository at this point in the history 
Fix problem when using asp:ScriptManager to add scripts
  • Loading branch information
@frequent
frequent committed Sep 26, 2012
2 parents 6877c49 + ee2e5f1 commit 890805b
Show file tree
Hide file tree
Showing 10 changed files with 848 additions and 434 deletions.
6 changes: 3 additions & 3 deletions multiview JQM 1.1.1/multiview.js
View file
@@ -1,4 +1,3 @@

/**
* jQuery Mobile Framework : "multiview" plugin
* @author Sven Franck <sven.franck@stokkers.de>
Expand Down Expand Up @@ -2441,8 +2440,9 @@
});

/** -------------------------------------- PLUGIN TRIGGER -------------------------------------- **/

$('div:jqmData(wrapper="true")').multiview();
$(document).bind('pageinit', function(event) {
$('div:jqmData(wrapper="true")').multiview();
});



Expand Down
46 changes: 46 additions & 0 deletions multiview JQM 1.2.0/Demo/DemoAutoshow.html
View file
@@ -0,0 +1,46 @@
<!DOCTYPE html>
<html>
<head>
<title>My Page</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.1/jquery.mobile-1.1.1.min.css" />
<link rel="stylesheet" href="../multiview.css" />
<script src="http://code.jquery.com/jquery-1.7.1.min.js">
</script>
<script src="../jquery-mobile.multiview.js">
</script>
<script src="../multiview.js">
</script>
</head>
<body>
<div data-role="page" data-wrapper="true">
<div data-role="panel" data-panel="menu" data-id="menu" data-autoshow="once">
<div data-role="page" data-show="first">
<div data-role="header">
<h1>My Menu Header</h1>
</div>
<div data-role="content">
<ul data-role="listview">
<li>
First Item
</li>
<li>
Second Item
</li>
</ul>
</div>
</div>
</div>
<div data-role="panel" data-panel="main" data-id="main">
<div data-role="page" data-show="first">
<div data-role="header">
<h1>My Main Header</h1>
</div>
<div data-role="content">
<p>Hello Main Panel</p>
</div>
</div>
</div>
</div>
</body>
</html>
48 changes: 48 additions & 0 deletions multiview JQM 1.2.0/Demo/DemoGlobalToolbar.html
View file
@@ -0,0 +1,48 @@
<!DOCTYPE html>
<html>
<head>
<title>My Page</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.1/jquery.mobile-1.1.1.min.css" />
<link rel="stylesheet" href="../multiview.css" />
<script src="http://code.jquery.com/jquery-1.7.1.min.js">
</script>
<script src="../jquery-mobile.multiview.js">
</script>
<script src="../multiview.js">
</script>
</head>
<body>
<div data-role="page" data-wrapper="true">
<div data-role="header">
<h1>My Global Header</h1>
</div>
<div data-role="panel" data-panel="menu" data-id="menu">
<div data-role="page" data-show="first">
<div data-role="content">
<ul data-role="listview">
<li>
First Item
</li>
<li>
Second Item
</li>
</ul>
</div>
</div>
</div>
<div data-role="panel" data-panel="main" data-id="main">
<div data-role="page" data-show="first">
<div data-role="content">
<p>
Hello Main Panel
</p>
</div>
</div>
</div>
<div data-role="footer">
<h1>My Global Footer</h1>
</div>
</div>
</body>
</html>
56 changes: 56 additions & 0 deletions multiview JQM 1.2.0/Demo/DemoMultiview.html
View file
@@ -0,0 +1,56 @@
<!DOCTYPE html>
<html>
<head>
<title>My Page</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.1/jquery.mobile-1.1.1.min.css" />
<link rel="stylesheet" href="../multiview.css" />
<script src="http://code.jquery.com/jquery-1.7.1.min.js">
</script>
<script src="../jquery-mobile.multiview.js">
</script>
<script src="../multiview.js">
</script>
</head>
<body>
<div data-role="page" data-wrapper="true">
<div data-role="panel" data-panel="menu" data-id="menu">
<div data-role="page" data-show="first">
<div data-role="header">
<h1>My Menu Header</h1>
</div>
<div data-role="content">
<ul data-role="listview">
<li>
First Item
</li>
<li>
Second Item
</li>
</ul>
</div>
</div>
</div>
<div data-role="panel" data-panel="mid" data-id="mid">
<div data-role="page" data-show="first">
<div data-role="header">
<h1>My Mid Header</h1>
</div>
<div data-role="content">
<p>Hello Mid Panel</p>
</div>
</div>
</div>
<div data-role="panel" data-panel="main" data-id="main">
<div data-role="page" data-show="first">
<div data-role="header">
<h1>My Main Header</h1>
</div>
<div data-role="content">
<p>Hello Main Panel</p>
</div>
</div>
</div>
</div>
</body>
</html>
126 changes: 126 additions & 0 deletions multiview JQM 1.2.0/Demo/DemoOverthrow.html
View file
@@ -0,0 +1,126 @@
<!DOCTYPE html>
<html>
<head>
<title>My Page</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.1/jquery.mobile-1.1.1.min.css" />
<link rel="stylesheet" href="../multiview.css" />
<script src="http://code.jquery.com/jquery-1.7.1.min.js">
</script>
<script src="../jquery-mobile.multiview.js">
</script>
<script src="../multiview.js">
</script>
</head>
<body>
<div data-role="page" data-wrapper="true" data-scrollMode="overthrow">
<div data-role="panel" data-panel="menu" data-id="menu">
<div data-role="page" data-show="first">
<div data-role="header">
<h1>My Menu Header</h1>
</div>
<div data-role="content">
<ul data-role="listview">
<li>
First Item
</li>
<li>
Second Item
</li>
<li>
First Item
</li>
<li>
Second Item
</li>
<li>
First Item
</li>
<li>
Second Item
</li>
<li>
First Item
</li>
<li>
Second Item
</li>
<li>
First Item
</li>
<li>
Second Item
</li>
<li>
First Item
</li>
<li>
Second Item
</li>
<li>
First Item
</li>
<li>
Second Item
</li>
<li>
First Item
</li>
<li>
Second Item
</li>
<li>
First Item
</li>
<li>
Second Item
</li>
<li>
First Item
</li>
<li>
Second Item
</li>
<li>
First Item
</li>
<li>
Second Item
</li>
<li>
First Item
</li>
<li>
Second Item
</li>
<li>
First Item
</li>
<li>
Second Item
</li>
<li>
First Item
</li>
<li>
Second Item
</li>
</ul>
</div>
</div>
</div>
<div data-role="panel" data-panel="main" data-id="main">
<div data-role="page" data-show="first">
<div data-role="header">
<h1>My Main Header</h1>
</div>
<div data-role="content">
<p>
Hello Main Panel
</p>
</div>
</div>
</div>
</div>
</body>
</html>
54 changes: 54 additions & 0 deletions multiview JQM 1.2.0/Demo/DemoSplitview.html
View file
@@ -0,0 +1,54 @@
<!DOCTYPE html>
<html>
<head>
<title>My Page</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.1/jquery.mobile-1.1.1.min.css" />
<link rel="stylesheet" href="../multiview.css" />
<script src="http://code.jquery.com/jquery-1.7.1.min.js">
</script>
<script src="../jquery-mobile.multiview.js">
</script>
<script src="../multiview.js">
</script>
</head>
<body>
<div data-role="page" data-wrapper="true">
<div data-role="panel" data-panel="menu" data-id="menu">
<div data-role="page" data-show="first">
<div data-role="header">
<h1>My Menu Header</h1>
</div>
<div data-role="content">
<ul data-role="listview">
<li>
First Item
</li>
<li>
Second Item
</li>
</ul>
</div>
<div data-role="header">
<h1>My Menu Foote</h1>
</div>
</div>
</div>
<div data-role="panel" data-panel="main" data-id="main">
<div data-role="page" data-show="first">
<div data-role="header">
<h1>My Main Header</h1>
</div>
<div data-role="content">
<p>
Hello Main Panel
</p>
</div>
<div data-role="header">
<h1>My Main Footer</h1>
</div>
</div>
</div>
</div>
</body>
</html>

0 comments on commit 890805b

Please sign in to comment.