Skip to content

Fixed the issue of user not able to type in text box : #118605155 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RJASeoud merged 1 commit into from
May 3, 2016
Merged

Fixed the issue of user not able to type in text box : #118605155 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions control/content/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,15 @@
ng-show="datastoreInitialized">
<div ng-form="frmMain">

<div class="item clearfix row margi
n-bottom-fifteen">
<div class="item clearfix row margin-bottom-fifteen">
<div class="labels col-md-3 padding-right-zero pull-left">
<span>URL to your PDF</span>
</div>
<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" ng-change="clearUrl()"
required
pattern="[-a-zA-Z0-9@:%_\+.~#?&amp;//=]{2,256}\.[a-z]{2,4}\b(\/[-a-zA-Z0-9@:%_\+.~#?!?\/?\w\/?&amp;//=]*)?">
<input id="url" name="url" type="url" class="form-control"
ng-model="data.content.url"
required>
</div>
<div class="col-md-3 pull-right padding-zero">
<button class="btn btn-success stretch" ng-click="validateUrl()"
Expand Down Expand Up @@ -102,6 +100,9 @@
} else {
dataChanged = true;
}
if (dataChanged && newObj.content && !newObj.content.url) {
$scope.clearUrl();
}
}, true);

if (!$scope.$$phase && !$scope.$root.$$phase) {
Expand Down Expand Up @@ -155,18 +156,16 @@
};

$scope.clearUrl = function () {
if (!$scope.data.content.url) {
$scope.data.content.url = null;
var data = $scope.data;
buildfire.datastore.save(data, function (err, result) {
if (err || !result) {
$log.error('Error saving the widget details: ', err);
}
else {
$log.info('Widget details saved');
}
});
}
$scope.data.content.url = undefined;
var data = $scope.data;
buildfire.datastore.save(data, function (err, result) {
if (err || !result) {
$log.error('Error saving the widget details: ', err);
}
else {
$log.info('Widget details saved');
}
});
};

$scope.openMethodChanged = function () {
Expand Down
15 changes: 9 additions & 6 deletions widget/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ <h2>Success!</h2>
<script>
buildfire.spinner.show();

function dataLoadedHandler(result) {

if (result && result.data && result.id) {
function dataLoadedHandler(result, fromUpdate) {
if (result && result.data && (result.id || fromUpdate)) {
var content = result.data.content;
if (content && content.url) {
buildfire.getContext(function (err, context) {
Expand All @@ -44,10 +43,14 @@ <h2>Success!</h2>

buildfire.navigation.goBack();
}

buildfire.spinner.hide();
});
}
else{
var d =document.getElementById("d");
d.style.display='none';
}
} else{
var d =document.getElementById("d");
d.style.display='';
Expand All @@ -72,9 +75,9 @@ <h2>Success!</h2>
});

buildfire.datastore.onUpdate(function (result) {
dataLoadedHandler(result);
dataLoadedHandler(result, true);
});

</script>
</body>
</html>