added package css and fixed ios template bug

melromero · melromero · commit 553dd477bbf2 · 2017-03-24T07:35:05.000+10:00
diff --git a/angular-ui-scribble.css b/angular-ui-scribble.css
@@ -0,0 +1,24 @@
+.scribble-canvas {
+	position: relative;
+	overflow: auto;
+	height: 230px;
+	/*height: 100%;*/
+}
+.scribble-canvas canvas {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+.scribble-actions li {
+	list-style: none;
+	display: inline;
+	width: 100px;
+}
+.scribble-actions button {
+	width: 70px;
+}
+.scribble-canvas button {
+	position: absolute;
+	bottom: 0px;
+	left: 340px;
+}
diff --git a/angular-ui-scribble.js b/angular-ui-scribble.js
@@ -7,19 +7,19 @@ angular.module('angular-ui-scribble',[])
 			callbackBtn: '&'
 		},
 		template:
-		`<div class="scribble">
-			<ul class="scribble-actions">
-				<li><button ng-click="clearSignature()">Clear</button></li>
-				<li ng-if='mode!="erase"'><button ng-click="setMode('erase')">Erase</button></li>
-				<li ng-if='mode=="erase"'><button ng-click="setMode('pen')">Pen</button></li>
-				<li><input  id="selectBackground" type="file" accept="image/*" capture="camera"></lis>
-			</ul>
-			<div class="scribble-canvas" height="200" width="350">
-				<canvas height="200" width="380" style="z-index:2;"></canvas>
-				<canvas id="scribble-background" height="200" width="380" style="z-index:1;"></canvas>
-				<button ng-if="signatureReady" ng-click="callbackBtn({signature: signaturePad.toDataURL()})">Done</button>
-			</div>
-		</div>`,
+		'<div class="scribble">'+
+			'<ul class="scribble-actions">'+
+				'<li><button ng-click="clearSignature()">Clear</button></li>'+
+				'<li ng-if=\'mode!="erase"\'><button ng-click="setMode(\'erase\')">Erase</button></li>'+
+				'<li ng-if=\'mode=="erase"\'><button ng-click="setMode(\'pen\')">Pen</button></li>'+
+				'<li><input  id="selectBackground" type="file" accept="image/*" capture="camera"></lis>'+
+			'</ul>'+
+			'<div class="scribble-canvas" height="200" width="350">'+
+				'<canvas height="200" width="380" style="z-index:2;"></canvas>'+
+				'<canvas id="scribble-background" height="200" width="380" style="z-index:1;"></canvas>'+
+				'<button ng-if="signatureReady" ng-click="callbackBtn({signature: signaturePad.toDataURL()})">Done</button>'+
+			'</div>'+
+		'</div>',
 		controller: function($scope, $element, $attrs){
 			$scope.mode = 'pen';
 			$scope.signaturePad;
diff --git a/demo/index.html b/demo/index.html
@@ -9,6 +9,7 @@
 		<link rel="stylesheet" href="./style.css">
 		<!-- Angular-UI-Scribble -->
 		<script src="../angular-ui-scribble.js"></script>
+		<link rel="stylesheet" href="../angular-ui-scribble.css">
 	</head>
 	<body ng-app="app">
 		<div ng-controller="scribbleExampleCtrl">
diff --git a/demo/style.css b/demo/style.css
@@ -1,35 +1,10 @@
 /* Demo css*/
-*{
+* {
 	font-family: verdana, arial,sans-serif;
 }
-pre{
+pre {
 	width: 70%;
 }
-.scribble-canvas canvas{
+.scribble-canvas canvas {
 	border: 1px solid #f4f4f4;
 }
-/* Add to package css*/
-.scribble-canvas {
-	position: relative;
-	overflow: auto;
-	height: 230px;
-	/*height: 100%;*/
-}
-.scribble-canvas canvas{
-	position: absolute;
-	top: 0;
-	left: 0;
-}
-.scribble-actions li{
-	list-style: none;
-	display: inline;
-	width: 100px;
-}
-.scribble-actions button{
-	width: 70px;
-}
-.scribble-canvas button{
-	position: absolute;
-	bottom: 0px;
-	left: 340px;
-}
