Merge pull request #29 from sakshityagi/master

Removed restriction for valid url and just showed a message in case invalid
BuildFire · Jun 23, 2016 · c7d9d8a · c7d9d8a
2 parents e76d73b + 9440c32
commit c7d9d8a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/control/content/app.js b/control/content/app.js
@@ -130,4 +130,8 @@ webviewPluginApp.controller("webviewPluginCtrl", ["$scope", "$log", "$timeout",
       }
     });
   };
+
+  $scope.isUrlValid = function (url) {
+    return /[-a-zA-Z0-9@:%_\+.~#?&amp;//=]{2,256}\.[a-z]{2,6}\b(\/[-a-zA-Z0-9@:%_\+.~#?!?\/?\w\/?&amp;//=]*)?/.test(url);
+  };
 }]);
diff --git a/control/content/index.html b/control/content/index.html
@@ -29,8 +29,7 @@
     <div class="main col-md-9 pull-right clearfix">
       <div class="col-md-9 pull-left padding-left-zero">
         <input id="url" name="url" type="text" class="form-control"
-               ng-model="data.content.url" required
-               pattern="[-a-zA-Z0-9@:%_\+.~#?&amp;//=]{2,256}\.[a-z]{2,6}\b(\/[-a-zA-Z0-9@:%_\+.~#?!?\/?\w\/?&amp;//=]*)?">
+               ng-model="data.content.url">
       </div>
       <div class="col-md-3 pull-right padding-zero">
         <button class="btn btn-success stretch" ng-click="validateUrl()"
@@ -41,6 +40,19 @@
     </div>
   </div>
 
+  <div class="item clearfix row"
+       ng-if="data.content.url && !isUrlValid(data.content.url)">
+    <div class="main pull-right col-md-9">
+      <p style="color: #ff7164">Seems like
+        your url is not valid ! But if you
+        want,
+        you can
+        still
+        add it
+        to your plugin.</p>
+    </div>
+  </div>
+
   <div class="item clearfix row">
     <div class="main pull-right col-md-9">
       <div class="alert alert-success alert-sm text-center" ng-if="urlValid">Url

diff --git a/widget/index.html b/widget/index.html
@@ -149,7 +149,7 @@ <h2>Success!</h2>
     };
 
     $scope.iframeLoadedCallBack = function () {
-      $scope.loading = 0
+      $scope.loading = 0;
       $scope.$apply();
       var webviewIframe = document.getElementById("webviewIframe");
       buildfire.spinner.hide();
-Original file line number
+Diff line change
@@ Expand Up @@
           }
         });
       };
+      $scope.isUrlValid = function (url) {
+        return /[-a-zA-Z0-9@:%_\+.~#?&amp;//=]{2,256}\.[a-z]{2,6}\b(\/[-a-zA-Z0-9@:%_\+.~#?!?\/?\w\/?&amp;//=]*)?/.test(url);
+      };
     }]);